Settings for using Visual Studio 2012 as a diff and merge (3-way) tool for git

.gitconfig

[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

Thanks for this milas!

NOTE: The merge tool is included as part of Visual Studio Update 2

Thank you! Could not get the escaping right to save my life until I found this.

Hm, I'm pretty sure trustexistcode = true should be trustexitcode = true

Do you have a problem where vsdiffmerge.exe exits before you shut down Visual Studio? This results in git launching multiple instances of VS concurrently - one for each file to be compared. Eventually, vsdiffmerge starts to crash when there are too many instances open. I am using VS 2013.

Hi does it work with VS2015? If I run git mergetool from the command line, no GUI is launched?

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

How to diff multiple files in a time?