Skip to content

Instantly share code, notes, and snippets.

@milas
Last active November 8, 2017 11:30
Show Gist options
  • Save milas/5254908 to your computer and use it in GitHub Desktop.
Save milas/5254908 to your computer and use it in GitHub Desktop.
Settings for using Visual Studio 2012 as a diff and merge (3-way) tool for git
[diff]
tool = vsdiffmerge
[difftool]
prompt = true
[difftool "vsdiffmerge"]
cmd = \""C:\\Program Files (x86)\\Microsoft Visual Studio 11.0\\Common7\\IDE\\vsdiffmerge.exe"\" \""$LOCAL"\" \""$REMOTE"\" //t
keepbackup = false
trustexistcode = true
[merge]
tool = vsdiffmerge
[mergetool]
prompt = true
[mergetool "vsdiffmerge"]
cmd = \""C:\\Program Files (x86)\\Microsoft Visual Studio 11.0\\Common7\\IDE\\vsdiffmerge.exe"\" \""$REMOTE"\" \""$LOCAL"\" \""$BASE"\" \""$MERGED"\" //m
keepbackup = false
trustexistcode = true
@IanKemp
Copy link

IanKemp commented Nov 8, 2017

As of VS2017, vsDiffMerge.exe exists in the directory <vs2017 install dir>\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer.

@lindexi
Copy link

lindexi commented Nov 8, 2017

How to diff multiple files in a time?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment