1.3.0.0.1 To configure Cornerstone to use Merge:.1.2.0.0.2 To configure the AccuRev client to use Merge for file merging:.1.2.0.0.1 To configure the AccuRev client to use Merge for file comparison:.1 Integrating with Source Control, Configuration Management and Other Applications.Some of the tools listed above only work in a windowedĮnvironment. The following tools are valid, but not currently available: 'git difftool -tool-' may be set to one of the following: You'll see something like the following result: You can see which diff tools are supported natively by git by running the following command: git difftool -tool-help Git config -global ('''' + $semanticMergeUserPath + ''' -d=\"$LOCAL\" -s=\"$REMOTE\" -edt=\"mergetool.exe config -global ('''' + $semanticMergeUserPath + ''' -b=\"$BASE\" -d=\"$LOCAL\" -s=\"$REMOTE\" -r=\"$MERGED\" -l=csharp -emt=\"mergetool.exe -edt=\"mergetool.exe config -global false
$semanticMergeUserPath = Resolve-Path ~\AppData\local\PlasticSCM4\semanticmerge\semanticmergetool.exe Note that this set of commands sets up the PlasticSCM merge tool as the fall-back when not merging C#. If you're coding in C#, it may be worth using Semantic Merge (also installable via Chocolatey). Note that p4merge is an officially supported diff tool in Git for Windows.
The following PowerShell uses Chocolatey to install p4merge and configures it as the diff and merge tool for Git. Git config -global false P4Merge (Perforce Merge)
Note that meld is an officially supported diff tool in Git for Windows. The following PowerShell uses Chocolatey to install meld and configures it as the diff and merge tool for Git.