Skip to content

Instantly share code, notes, and snippets.

@cleberdantas

cleberdantas/mergetool

Created October 15, 2014 00:24
Show Gist options
  • Save cleberdantas/8e7609f98760758f73c2 to your computer and use it in GitHub Desktop.
Save cleberdantas/8e7609f98760758f73c2 to your computer and use it in GitHub Desktop.
Download ZIP
git mergetool configurado para o Visual Studio
Raw
mergetool
[diff]
tool = vsdiffmerge
[difftool]
prompt = false
keepBackup = false
[difftool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
trustexistcode = true
[merge]
tool = vsdiffmerge
[mergetool]
prompt = false
keepBackup = false
[mergetool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
trustexistcode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment