diff --git a/.gitconfig_includes.common b/.gitconfig_includes.common
index 96ef78da..a4e7b112 100644
--- a/.gitconfig_includes.common
+++ b/.gitconfig_includes.common
@@ -23,3 +23,6 @@
     tool = kdiff3
 [mergetool]
 	keepBackup = false
+[mergetool "splice"]
+    cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
+    trustExitCode = true