-
-
Save arcadepro/3e63c9327953a40a45f1 to your computer and use it in GitHub Desktop.
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 | |
| keepBackup = false | |
| [mergetool "p4merge"] | |
| cmd = p4merge.exe /\"$BASE/\" /\"$LOCAL/\" /\"$REMOTE/\" /\"$MERGED/\" | |
| trustExitCode = false | |
| keepBackup = false | |
| [diff] | |
| tool = p4merge | |
| guitool = p4merge | |
| [difftool] | |
| prompt = false | |
| cmd = \"c:/program files/Perforce/p4merge.exe\" \"$LOCAL\" \"$REMOTE\" | |
| [mergetool] | |
| keepBackup = false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
git config --global diff.tool p4merge
git config --global merge.tool p4merge
git config --global mergetool.p4merge.keeptemporaries false
git config --global mergetool.p4merge.trustExitCode false
git config --global mergetool.p4merge.keepbackup false