From: Stefan Huber <shuber2@gmx.at>
Date: Wed, 7 Nov 2012 21:26:02 +0000 (+0100)
Subject: Adding splice as merge tool
X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=252585f90d9efec77b1bd5602ff98e19b86d87e4;p=shutils.git

Adding splice as merge tool
---

diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index 7ff0347..d31aa9e 100644
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -8,7 +8,10 @@
 	editor = vim
 	pager = less -FXRS -x4
 [merge]
-	tool = gvimdiff
+	tool = splice
+[mergetool "splice"]
+	cmd = "gvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
+	trustExitCode = true
 [alias]
 	wdiff = diff --color-words
 	wlog = log --color-words
diff --git a/dotfiles/hg/hgrc b/dotfiles/hg/hgrc
index d473cbd..87acaae 100644
--- a/dotfiles/hg/hgrc
+++ b/dotfiles/hg/hgrc
@@ -4,8 +4,10 @@ merge = gvimdiff
 editor = vim
 
 [merge-tools]
-gvimdiff.executable = gvim
-gvimdiff.args = -f -d $base $local $output $other -c "wincmd J"
+splice.executable = gvim
+splice.args = -f $base $local $other $output -c 'SpliceInit'
+splice.premerge = keep
+splice.priority = 1
 
 [web]
 cacerts =