Skip to content

Instantly share code, notes, and snippets.

@OsirisTerje

OsirisTerje/gitconfig-merge-section

Created May 10, 2014 23:21
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 OsirisTerje/42a913d2920723bc777a to your computer and use it in GitHub Desktop.
Save OsirisTerje/42a913d2920723bc777a to your computer and use it in GitHub Desktop.
Download ZIP
Setting up merge on VS2013 for Git, add to .gitconfig found at c:\users\(yourusername)
Raw
gitconfig-merge-section
[diff]
tool = vsdiffmerge
[difftool]
prompt = true
[difftool "vsdiffmerge"]
cmd = \"vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
keepbackup = false
trustexistcode = true
[merge]
tool = vsdiffmerge
[mergetool]
prompt = true
[mergetool "vsdiffmerge"]
cmd = \"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