~cyplo/dotfiles

1c16fdee51d840bf513f793456b77047537a23fd — Cyryl Plotnicki-Chudyk 6 years ago d7dcd8b
splice mergetool added
1 files changed, 3 insertions(+), 0 deletions(-)

M .gitconfig_includes.common
M .gitconfig_includes.common => .gitconfig_includes.common +3 -0
@@ 23,3 23,6 @@
    tool = kdiff3
[mergetool]
	keepBackup = false
[mergetool "splice"]
    cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
    trustExitCode = true