Skip to content

Instantly share code, notes, and snippets.

@alkampfergit

alkampfergit/gist:fca40445f118095e37f549f7058e71cd

Created January 9, 2018 08:47
Show Gist options
  • Save alkampfergit/fca40445f118095e37f549f7058e71cd to your computer and use it in GitHub Desktop.
Save alkampfergit/fca40445f118095e37f549f7058e71cd to your computer and use it in GitHub Desktop.
Download ZIP
Configure Visual Studio 2013 as Git Diff and Merge tool
Raw
gistfile1.txt
[diff]
tool = vsdiffmerge
[difftool]
prompt = true
[difftool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 12.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 12.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
keepbackup = false
trustexistcode = true
@alkampfergit
Copy link
Author

If you want to use VS 2015 just change the path to 14.0

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