cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use p4merge under windows, for mergetool only

Browse source
This commit is contained in:
Cyryl Plotnicki-Chudyk 2015-04-22 10:59:00 +02:00
parent 21e14a7c76
commit 825be6d69a
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitconfig_includes.cygwin
View file

@ -0,0 +1,5 @@
[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