Friday, March 21, 2014

How to Setup Perforce Merge p4merge with git in OSX

1. Download P4V.dmg (Perforce Client)

2. Copy the p4merge.app to your /Applications directory

3. Then run the following commands:
git config --global merge.tool p4merge
git config --global mergetool.p4merge.path /Applications/p4merge.app/Contents/Resources/launchp4merge