Skip to content

Instantly share code, notes, and snippets.

@Klerith

Klerith/.gitconfig

Forked from orj/.gitconfig
Last active May 31, 2017 22:33
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Klerith/3cc3b0bbca28e00246f20fd292316700 to your computer and use it in GitHub Desktop.
Save Klerith/3cc3b0bbca28e00246f20fd292316700 to your computer and use it in GitHub Desktop.
Download ZIP
GIT: 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