Skip to content

Instantly share code, notes, and snippets.

@jairzh

jairzh/p4merge.gitconfig

Last active December 14, 2015 10:48
Show Gist options
  • Save jairzh/5074592 to your computer and use it in GitHub Desktop.
Save jairzh/5074592 to your computer and use it in GitHub Desktop.
Download ZIP
p4merge
Raw
p4merge.gitconfig
[merge]
tool = mymerge
[mergetool "mymerge"]
cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[mergetool]
keepBackup = false
[diff]
tool = mydiff
trustExitCode = false
[difftool "mydiff"]
cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$BASE\" \"$LOCAL\"
trustExitCode = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment