Created
April 25, 2012 16:31
-
-
Save luismayta/2491102 to your computer and use it in GitHub Desktop.
git config for p4merge
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
| #git config --global -e | |
| [merge] | |
| keepBackup = false; | |
| tool = p4merge | |
| [mergetool "p4merge"] | |
| cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED" | |
| keepTemporaries = false | |
| trustExitCode = false | |
| keepBackup = false | |
| [diff] | |
| external = p4diff |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment