Created
May 27, 2011 02:43
-
-
Save orj/994547 to your computer and use it in GitHub Desktop.
Using p4merge as Git mergetool on Mac OS X.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [merge] | |
| keepBackup = false | |
| tool = custom | |
| [mergetool "custom"] | |
| cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED" | |
| keepTemporaries = false | |
| trustExitCode = false | |
| keepBackup = false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment