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

splice mergetool added

Browse source
This commit is contained in:
Cyryl Plotnicki-Chudyk 2015-01-28 22:39:37 +01:00
parent b541388c84
commit 90570dc4f5
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitconfig_includes.common
View file

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