2017-01-26 05:44:03 +00:00
|
|
|
[merge]
|
|
|
|
|
keepBackup = false
|
|
|
|
|
tool = p4merge
|
|
|
|
|
[mergetool "p4merge"]
|
|
|
|
|
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$PWD/$BASE\"" "\"$PWD/$REMOTE\"" "\"$PWD/$LOCAL\"" "\"$PWD/$MERGED\""
|
|
|
|
|
keepTemporaries = false
|
2013-09-16 10:39:41 +01:00
|
|
|
trustExitCode = false
|
|
|
|
|
keepBackup = false
|
2017-01-26 05:44:03 +00:00
|
|
|
[diff]
|
|
|
|
|
tool = p4merge
|
|
|
|
|
[difftool "p4merge"]
|
|
|
|
|
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$REMOTE\"" "\"$LOCAL\""
|
2013-10-09 11:21:14 +01:00
|
|
|
|
