Skip to content

Instantly share code, notes, and snippets.

@alkampfergit

alkampfergit/gist:bbb2af06c1ddd71ce0fe941554a885db

Created April 8, 2016 10:59
Show Gist options
  • Save alkampfergit/bbb2af06c1ddd71ce0fe941554a885db to your computer and use it in GitHub Desktop.
Save alkampfergit/bbb2af06c1ddd71ce0fe941554a885db to your computer and use it in GitHub Desktop.
Download ZIP
Git merge settings for Visual Studio
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment