Skip to content

Instantly share code, notes, and snippets.

@drub0y

drub0y/.gitconfig

Created April 21, 2016 19:51
Show Gist options
  • Save drub0y/605e29f2cd4cbe06eccf8d0554e7e134 to your computer and use it in GitHub Desktop.
Save drub0y/605e29f2cd4cbe06eccf8d0554e7e134 to your computer and use it in GitHub Desktop.
Download ZIP
VSDiffMerge as Git DiffTool/MergeTool
Raw
.gitconfig
[diff]
tool = vsdiffmerge
[difftool]
prompt = true
[difftool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
[difftool "vsdiffmerge"]
keepbackup = false
[merge]
tool = vsdiffmerge
[mergetool]
prompt = true
[mergetool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
trustexitcode = true
[mergetool "vsdiffmerge"]
keepbackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment