Last active
August 29, 2015 14:01
-
-
Save moltak/342b040bd27091aacc8f to your computer and use it in GitHub Desktop.
git mergetool
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
| [core] | |
| editor = subl -n -w | |
| [merge] | |
| 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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment