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[@]}"

I wrote wrapper scripts for Windows, Mac and Linux to iron out the integration of p4merge with git: http://pempek.net/articles/2014/04/18/git-p4merge/

Hope that helps.

thank you for share,it's very useful for my problem with OS x EI caption

Easiest way to setup is thru cask:
https://github.com/max-lobur/dotfiles/blob/master/mac/20_packages_brew_cask.sh#L30