Skip to content

Instantly share code, notes, and snippets.

@prollin
Created February 2, 2019 22:12
Show Gist options
  • Save prollin/7a74865a343180f760ecc7efaa4a0fad to your computer and use it in GitHub Desktop.
Save prollin/7a74865a343180f760ecc7efaa4a0fad to your computer and use it in GitHub Desktop.
[diff]
tool = vsdiffmerge
[difftool]
prompt = false
[difftool "vsdiffmerge"]
cmd = '"C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/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/2017/Professional/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/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