Adding splice as merge tool

diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index 7ff03478e7261f04acfac7e40bc6f6b72b1a7f45..d31aa9e6ee118f00da5990e5cba7acf9775b7954 100644 (file)
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -8,7 +8,10 @@
        editor = vim
        pager = less -FXRS -x4
 [merge]
        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
 [alias]
        wdiff = diff --color-words
        wlog = log --color-words

diff --git a/dotfiles/hg/hgrc b/dotfiles/hg/hgrc
index d473cbd6dafc5354feee50c3d2a4e55c06a545d8..87acaae94716a024df990e8068e91232a2cd4a25 100644 (file)
--- a/dotfiles/hg/hgrc
+++ b/dotfiles/hg/hgrc
@@ -4,8 +4,10 @@ merge = gvimdiff
 editor = vim
 
 [merge-tools]
 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 =
 
 [web]
 cacerts =