Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

How to configure Visual Studio to use Beyond compare for TFS GIT?

Is there a way to use Beyond Compare as the default comparison tool when doing "Compare with Unmodified" in Visual Studio 2015/2017 when using Git?

enter image description here

I don't find the "Configure User tools" option as described in How to configure Visual Studio to use Beyond Compare.

enter image description here

like image 559
Nemo Avatar asked Mar 16 '17 08:03

Nemo


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.

Can we compare 3 files in beyond compare?

Beyond Compare is limited to 2-way comparison. If the main file and the other files are all located in the same folder, load the folder in the Folder Compare. Then select the main file and one of the other files. Right click and select Open to launch the two files in the Text Compare.

How do I add beyond compare to perforce?

In Beyond Compare Pro, open Tools | Source Control Integration. Click the Browse button and select the working folder for your Perforce workspace. Click Add and fill in your Perforce connection information.


2 Answers

One option is to follow edit .git/config to configure the diff tool as described here: http://www.scootersoftware.com/support.php?zz=kb_vcs#visualstudio-git

like image 133
softwarematter Avatar answered Sep 21 '22 08:09

softwarematter


The Configure User tools is only work with Visual Studio Team Foundation Server source control plug-in. Not available with GIT source control plug-in.

Since Visual Studio Git Plugin uses standard git configuration, your local repository probably does not have any specific tools for diff and merge (unless you configured them), so global settings are honored.

To verify actual settings you can open a Git Bash on the repository, issue a git config –list command and look at merge.tool and diff.tool settings

enter image description here

Try to change it here, more ways please take a look at this blog: How to configure diff and Merge tool in Visual Studio Git Tools

like image 28
PatrickLu-MSFT Avatar answered Sep 24 '22 08:09

PatrickLu-MSFT