Setting up Beyond Compare in Visual Studio 2013 when using Git

Question

How to configure Visual Studio to use Beyond Compare has a great answer for how to configure Visual Studio to use Beyond Compare. However, the UI for these steps has changed in

Answer 1

I see your BeyondCompare integration and raise you automerge capabilities. Trust me if you are merging large amounts of files you will want the automerge option enabled :)

[diff]
        tool = bc3
[difftool]
        prompt = false
[difftool "bc3"]
        path = /c/Program Files (x86)/Beyond Compare 3/BComp.exe
[merge]
        tool = bc3
[mergetool]
        prompt = false
        keepBackup = false
[mergetool "bc3"]
        cmd = /c/Program Files (x86)/Beyond Compare 3/BComp.exe -automerge -ignoreunimportant -reviewconflicts "$LOCAL" "$REMOTE" "$BASE" "$MERGED" 
        trustExitCode = true

Answer 2

At least for VS 2012 you can actually just update from the command prompt as shown on the Scooter website. http://www.scootersoftware.com/support.php?zz=kb_vcs#gitwindows

If you've installed msysgitVS using the Configure User Tools thingy in VS, your path to Git will probably be:

C:\Program Files (x86)\Git\cmd\git.exe

For Git 1.7.6 and newer, edit the global config file to set the path. At a Windows command prompt enter the following commands:

For Beyond Compare v3 use:

git config --global diff.tool bc3

git config --global difftool.bc3.path "c:/program files (x86)/beyond compare 3/bcomp.exe"

If you've got PRO license, also these:

git config --global merge.tool bc3

git config --global mergetool.bc3.path "c:/program files (x86)/beyond compare 3/bcomp.exe"

Then when doing a comparison in Visual Studio it will use BeyondCompare.

---

For Beyond Compare v4 use:

git config --global diff.tool bc4

git config --global difftool.bc4.cmd "\"c:/program files (x86)/beyond compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\""

and

git config --global merge.tool bc4

git config --global mergetool.bc4.cmd "\"c:/program files (x86)/beyond compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""

git config --global mergetool.bc4.trustExitCode true