Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Setting up Beyond Compare in Visual Studio 2013 when using Git

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 Visual Studio 2013. Part of this may be due to the fact that I'm using Git for my SCM, and VS 2013 now has native Git support.

Has anyone figured out how to configure VS 2013 to use Beyond Compare?

like image 610
Jacob Avatar asked Oct 19 '13 02:10

Jacob


People also ask

How do I add Beyond Compare to git?

Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools. Open Tower's preferences dialog on the Git Config Tab. Set the Diff Tool drop-down to Beyond Compare. Set the Merge tool drop-down to Beyond Compare.

How do I set Beyond Compare in Visual Studio?

Open Visual Studio. Select Options from the Tools menu. Select Source Control | Subversion User Tools. For the Diff and Merge entries, select Beyond Compare from the dropdown.

How do I change the diff tool in Visual Studio?

To integrate Code Compare into Team Foundation Server, open the Visual Studio options (Tools → Options). In the displayed dialog box, select the Source Control → Visual Studio Team Foundation Server node. Click the Configure User Tools button to set up diff and merge tools.


1 Answers

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

like image 96
Kent Fehribach Avatar answered Sep 20 '22 03:09

Kent Fehribach