My tech blog. By Thomas Polasek.
git config --global merge.tool p4merge git config --global mergetool.p4merge.path /Applications/p4merge.app/Contents/Resources/launchp4merge