Skip to content

Instantly share code, notes, and snippets.

@segilbert

segilbert/vsDiffMerge.gitconfig

Created April 24, 2017 16:05
Show Gist options
  • Save segilbert/c9cfce4d96739888d221c45f33723858 to your computer and use it in GitHub Desktop.
Save segilbert/c9cfce4d96739888d221c45f33723858 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
vsDiffMerge.gitconfig
[diff]
tool = vsdiffmerge
[difftool]
prompt = false
[difftool "vsdiffmerge"]
cmd = '"C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe"' "$LOCAL" "$REMOTE" //t
keepbackup = false
trustexitcode = true
[merge]
tool = vsdiffmerge
[mergetool]
prompt = false
[mergetool "vsdiffmerge"]
cmd = '"C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe"' "$REMOTE" "$LOCAL" "$BASE" "$MERGED" //m
keepbackup = false
trustexitcode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment