Skip to content

Instantly share code, notes, and snippets.

@adomokos

adomokos/.gitconfig

Created December 2, 2011 21:09
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 adomokos/1424851 to your computer and use it in GitHub Desktop.
Save adomokos/1424851 to your computer and use it in GitHub Desktop.
Download ZIP
Wiring up p4merge
Raw
.gitconfig
...
[merge]
summary = true
tool = p4
[mergetool "p4"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$LOCAL" "$PWD/$REMOTE" "$PWD/$MERGED"
keepBackup = false
trustExitCode = false
[mergetool]
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment