~cyplo/dotfiles

a0f3bd2d15610eab61c0e4f36f841ed7e29a4287 — Cyryl Plotnicki-Chudyk 6 years ago 0384208
vimdiff as a default difftool everywhere
2 files changed, 2 insertions(+), 22 deletions(-)

M .gitconfig_includes.common
M .gitconfig_includes.cygwin
M .gitconfig_includes.common => .gitconfig_includes.common +1 -6
@@ 14,16 14,11 @@
    head = log HEAD -n1
[core]
    autocrlf = false


[diff]
    tool = kdiff3
    tool = vimdiff
[difftool]
    prompt = false
[merge]
    tool = kdiff3
[mergetool]
	keepBackup = false
[mergetool "splice"]
    cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
    trustExitCode = true

M .gitconfig_includes.cygwin => .gitconfig_includes.cygwin +1 -16
@@ 1,17 1,2 @@
[difftool "kdiff3"]
    path = kdiff3.sh
    trustExitCode = false
[difftool]
    prompt = false
[diff]
    tool = kdiff3
[mergetool "kdiff3"]
    path = kdiff3.sh
    trustExitCode = false
    keepBackup = false
[merge]
    tool = kdiff3

[core]
	autocrlf = false

	autocrlf = true