Skip to content

Instantly share code, notes, and snippets.

@ccll

ccll/.gitconfig.user

Created March 27, 2015 05: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 ccll/d33ed004a045ed440ba2 to your computer and use it in GitHub Desktop.
Save ccll/d33ed004a045ed440ba2 to your computer and use it in GitHub Desktop.
Download ZIP
p4merge for 'git mergetool'
Raw
.gitconfig.user
[diff]
tool = p4merge
[merge]
tool = p4merge
[difftool "p4merge"]
cmd = ~/bin/p4merge \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "p4merge"]
cmd = ~/bin/p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment