~cyplo/dotfiles

dotfiles/.gitconfig_includes.cygwin -rw-r--r-- 555 bytes
d90976db — Cyryl Płotnicki update 14 hours ago
                                                                                
1
2
3
4
5
6
7
8
9
10
11
12
13
[core]
	autocrlf = false
[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