William Bergqvist shazmodan
wtowns
/ p4merge Windows settings
Created
October 7, 2010 18:13
.gitconfig settings to use p4merge in Windows
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 | |
| [difftool "p4merge"] | |
| cmd = "p4merge.exe $LOCAL $REMOTE" | |
| [merge] | |
| tool = p4merge | |
| [mergetool "p4merge"] | |
| cmd = "p4merge.exe $BASE $LOCAL $REMOTE $MERGED" | |
| trustExitCode = true | |
| keepBackup = false |