Skip to content

Instantly share code, notes, and snippets.

@Const-me

Const-me/.gitconfig

Created April 8, 2020 12:47
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Const-me/1e8b57ade51c004c638a8f8c9b50859b to your computer and use it in GitHub Desktop.
Save Const-me/1e8b57ade51c004c638a8f8c9b50859b to your computer and use it in GitHub Desktop.
Download ZIP
vsDiffMerge.exe setup as a GIT merge tool
Raw
.gitconfig
[diff]
tool = vsdiffmerge
guitool = vsdiffmerge
[difftool]
prompt = false
[difftool "vsdiffmerge"]
cmd = '"C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/vsDiffMerge.exe"' "$LOCAL" "$REMOTE" //t
keepbackup = false
trustexistcode = true
[merge]
tool = vsdiffmergetool
[mergetool]
prompt = false
[mergetool "vsdiffmergetool"]
cmd = '"C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/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