Skip to content

Instantly share code, notes, and snippets.

What would you like to do?
Using p4merge as Git mergetool on Mac OS X.
keepBackup = false
tool = custom
[mergetool "custom"]
cmd = /Applications/ "$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
You can’t perform that action at this time.