git diff config p4merge in Mac

1. Install p4merge from perforce.com
2. Put the following bits in your ~/.gitconfig, and then you can do $ git mergetool and $ git difftool to use p4merge
3. Note that $ git diff will still just use the default inline diff viewer :)

[merge] keepBackup = false tool = p4merge [mergetool "p4merge"] cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$PWD/$BASE\"" "\"$PWD/$REMOTE\"" "\"$PWD/$LOCAL\"" "\"$PWD/$MERGED\"" keepTemporaries = false trustExitCode = false keepBackup = false [diff] tool = p4merge [difftool "p4merge"] cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$REMOTE\"" "\"$LOCAL\""

gist.github.com/SeanSSDing/d56d8b8aa4c79a05939b9ad3a6a63c8f