Skip to content

Instantly share code, notes, and snippets.

@lars-erik
Forked from milas/.gitconfig
Last active October 12, 2015 13:35
Show Gist options
  • Save lars-erik/233e227ac73699e5f22c to your computer and use it in GitHub Desktop.
Save lars-erik/233e227ac73699e5f22c to your computer and use it in GitHub Desktop.
Updated to VS 2013
[diff]
tool = vsdiffmerge
guitool = 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