Created
March 27, 2015 05:09
-
-
Save ccll/d33ed004a045ed440ba2 to your computer and use it in GitHub Desktop.
p4merge for 'git mergetool'
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
| [diff] | |
| tool = p4merge | |
| [merge] | |
| tool = p4merge | |
| [difftool "p4merge"] | |
| cmd = ~/bin/p4merge \"$LOCAL\" \"$REMOTE\" | |
| path = | |
| [mergetool "p4merge"] | |
| cmd = ~/bin/p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" | |
| trustExitCode = true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment