Skip to content

Instantly share code, notes, and snippets.

@adautoneto

adautoneto/GitMergeTool

Last active December 14, 2015 15:29
Show Gist options
  • Save adautoneto/5108087 to your computer and use it in GitHub Desktop.
Save adautoneto/5108087 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
GitMergeTool
git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd 'p4merge.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"'
git config --global mergetool.tortoisemerge.cmd \""c:/Program Files/TortoiseSVN/bin/TortoiseMerge.exe"\" -base:"$BASE" -theirs:"$REMOTE" -mine:"$LOCAL" -merged:"$MERGED"
In .git/config:
cmd = TortoiseMerge.exe /base:$(cygpath -d \"$BASE\") /theirs:$(cygpath -d \"$REMOTE\") /mine:$(cygpath -d \"$LOCAL\") /merged:$(cygpath -d \"$MERGED\")
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment