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

Merge pull request #13 from cyplo/merge_tools_windows

Browse source 
Added P4Merge and WinMerge as git diff tools on cygwin
This commit is contained in:
Cyryl Płotnicki-Chudyk 2016-07-13 10:08:18 +02:00 committed by GitHub
parent 2b949046b7 4963f64b99
commit bb310254c1
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitconfig_includes.cygwin
View file

@ -1,3 +1,9 @@
[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
[mergetool "p4merge"]
cmd = 'C:/Program Files/Perforce/p4merge.exe' "$(cygpath -wla $BASE)" "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)" "$(cygpath -wla $MERGED)"
trustExitCode = false