~cyplo/dotfiles

ref: 57ef81646178fb56b9e7df2ae6b00f5dfe3bba0d dotfiles/.gitconfig_includes.cygwin -rw-r--r-- 530 bytes
57ef8164 — Cyryl Płotnicki Merge branch 'master' into cucumber 5 years ago
                                                                                
1
2
3
4
5
6
7
8
9
10
11
[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
[merge]
  tool = p4merge