Helper script for p4merge and Git on MacOSX

readme.md

• Copy p4merge to /usr/local/bin/p4merge
• Download P4V.dmg and copy p4merge.app to /Applications
• Configure Git:

$ chmod 755 /usr/local/bin/p4merge
$ git config --global merge.tool p4merge
$ git config --global mergetool.prompt false
$ git config --global mergetool.keepBackup false
$ git config --global mergetool.p4merge.path /usr/local/bin/p4merge

• git mergetooland git difftool will launch p4merge now.

p4merge

#!/bin/bash

for arg; do [[ $arg = /* ]] || arg=$PWD/$arg; absargs+=("$arg"); done;
/Applications/p4merge.app/Contents/Resources/launchp4merge "${absargs[@]}"