From 90570dc4f5cb07d66b78b55859d051b8bce70c62 Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Wed, 28 Jan 2015 22:39:37 +0100
Subject: [PATCH] splice mergetool added

---
 .gitconfig_includes.common | 3 +++
 1 file changed, 3 insertions(+)

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