Created
January 17, 2019 13:30
-
-
Save caveman-dick/a72257cd2298adf244acea94d4d10904 to your computer and use it in GitHub Desktop.
Git p4merge settings
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 | |
| [mergetool "p4merge"] | |
| cmd = p4merge.exe -nb Base -nl Theirs -nr Yours -nm Merged \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment