Last active
August 29, 2015 14:15
-
-
Save cweekly/5757ef8f1e2c52c631b0 to your computer and use it in GitHub Desktop.
.gitconfig for p4merge (dirs w spaces)
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 | |
| conflictstyle = diff3 | |
| [mergetool "p4merge"] | |
| cmd = "'/Applications/p4merge.app/Contents/Resources/launchp4merge'" \ | |
| "\"$PWD/$BASE\"" "\"$PWD/$REMOTE\"" "\"$PWD/$LOCAL\"" "\"$PWD/$MERGED\"" | |
| keepBackup = false | |
| keepTemporaries = false | |
| trustExitCode = false | |
| [diff] | |
| tool = p4merge | |
| [difftool "p4merge"] | |
| cmd = "'/Applications/p4merge.app/Contents/Resources/launchp4merge'" \ | |
| "\"$LOCAL\"" "\"$REMOTE\"" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
(reversed LOCAL and REMOTE order for diffs)