Setting up p4merge and diff on Mac OSX

p4diff

#!/bin/sh
[ $# -eq 7 ] && /usr/local/bin/p4merge "$2" "$PWD/$5"

p4merge

#!/bin/sh
/Applications/p4merge.app/Contents/MacOS/p4merge $*

Perforce-Gitconfig

# Other Stuff
[merge]
    tool = p4merge
    keepBackup = false
[mergetool "p4merge"]
    cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false
[diff]
    external = p4diff