Skip to content

Instantly share code, notes, and snippets.

@andreimoment

andreimoment/.gitconfig

Forked from orj/.gitconfig
Last active December 26, 2015 04:39
Show Gist options
  • Save andreimoment/7095358 to your computer and use it in GitHub Desktop.
Save andreimoment/7095358 to your computer and use it in GitHub Desktop.
Download ZIP
gitconfig settings for p4merge
Raw
.gitconfig
[merge]
keepBackup = false
tool = custom
[mergetool "custom"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$BASE" "$REMOTE" "$LOCAL" "$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