Skip to content

Instantly share code, notes, and snippets.

@banshee
Last active January 2, 2016 15:39
Show Gist options
  • Save banshee/8324977 to your computer and use it in GitHub Desktop.
Save banshee/8324977 to your computer and use it in GitHub Desktop.
part of my .gitconfig file
[merge]
summary = true
tool = "p4"
[mergetool "p4"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge \
"$PWD/$BASE" \
"$PWD/$LOCAL" \
"$PWD/$REMOTE" \
"$PWD/$MERGED"
[diff.tool "p4"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge \
"$PWD/$BASE" \
"$PWD/$LOCAL" \
"$PWD/$REMOTE" \
"$PWD/$MERGED"
[diff]
tool = p4mergetool
[difftool "p4mergetool"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $LOCAL $REMOTE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment