Created
October 23, 2012 23:26
-
-
Save ltcdnunez/3942476 to your computer and use it in GitHub Desktop.
Git config 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] | |
| tool = p4merge | |
| [diff] | |
| tool = p4diff | |
| [mergetool "p4merge"] | |
| cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED" | |
| trustExitCode = false | |
| keepBackup = false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment