Created
April 17, 2012 08:43
-
-
Save WilbertOnGithub/2404673 to your computer and use it in GitHub Desktop.
Configure Git with P4Merge (Windows settings)
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
| git config --global merge.tool p4merge | |
| git config --global mergetool.p4merge.cmd "p4merge.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"" | |
| git config --global diff.tool p4merge | |
| git config --global difftool.p4merge.cmd "p4merge.exe \"$LOCAL\" \"$REMOTE\"" | |
| git config --global mergetool.keepBackup false | |
| git config --global mergetool.trustExitcode false | |
| git config --global difftool.prompt false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment