Skip to content

Instantly share code, notes, and snippets.

@orj

orj/.gitconfig

Created May 27, 2011 02:43
Show Gist options
  • Star 25 You must be signed in to star a gist
  • Fork 12 You must be signed in to fork a gist
  • Save orj/994547 to your computer and use it in GitHub Desktop.
Save orj/994547 to your computer and use it in GitHub Desktop.
Download ZIP
Using p4merge as Git mergetool on Mac OS X.
Raw
.gitconfig
[merge]
keepBackup = false
tool = custom
[mergetool "custom"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED"
keepTemporaries = false
trustExitCode = false
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment