Skip to content

Instantly share code, notes, and snippets.

@garymcleanhall

garymcleanhall/git-config-mergetools

Last active March 1, 2017 17:13
Show Gist options
  • Save garymcleanhall/2db465ef6917ecc4b322 to your computer and use it in GitHub Desktop.
Save garymcleanhall/2db465ef6917ecc4b322 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git-config-mergetools
[merge]
tool = p4merge
[diff]
tool = p4merge
guitool = vimdiff
[difftool "p4merge"]
cmd = \"~/difftool.bat\" $LOCAL $REMOTE
[difftool]
prompt = false
[mergetool "p4merge"]
cmd = \"~/mergetool.bat\" $BASE $LOCAL $REMOTE $MERGED
[mergetool]
prompt = false
trustExitCode = false
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment