2016-07-12 14:35:12 +01:00
|
|
|
[difftool "winmerge"]
|
|
|
|
|
cmd = 'C:/Program Files (x86)/WinMerge/WinMergeU.exe' "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)"
|
|
|
|
|
trustExitCode = false
|
|
|
|
|
[difftool "p4merge"]
|
|
|
|
|
cmd = 'C:/Program Files/Perforce/p4merge.exe' "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)"
|
|
|
|
|
trustExitCode = false
|
2015-04-22 09:59:00 +01:00
|
|
|
[mergetool "p4merge"]
|
|
|
|
|
cmd = 'C:/Program Files/Perforce/p4merge.exe' "$(cygpath -wla $BASE)" "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)" "$(cygpath -wla $MERGED)"
|
|
|
|
|
trustExitCode = false
|
|
|
|
|
[merge]
|
|
|
|
|
tool = p4merge
|
