dotfiles/.gitconfig_includes.cygwin
2015-04-22 10:59:00 +02:00

5 lines
225 B
Text

[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