dotfiles/.gitconfig_includes.cygwin

[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
use p4merge under windows, for mergetool only 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`