Created
January 10, 2014 19:09
-
-
Save mrbfrank/8360539 to your computer and use it in GitHub Desktop.
.gitconfig for P4merge
This file contains hidden or 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 = p4merge | |
| [mergetool "p4merge"] | |
| cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$PWD/$BASE\"" "\"$PWD/$REMOTE\"" "\"$PWD/$LOCAL\"" "\"$PWD/$MERGED\"" | |
| keepTemporaries = false | |
| trustExitCode = false | |
| keepBackup = false | |
| [diff] | |
| tool = p4merge | |
| [difftool "p4merge"] | |
| cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$REMOTE\"" "\"$LOCAL\"" |
mrbfrank
commented
Jan 10, 2014
Author
- Install p4merge from perforce.com
- Put the following bits in your ~/.gitconfig, and then you can do $ git mergetool and $ git difftool to use p4merge
- Note that $ git diff will still just use the default inline diff viewer :) (tested with git version 1.8.2)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment