Merge branch 'master' of ssh://aristoteles.sthu.org:2407/~/gitweb/shutils

[shutils.git] / dotfiles / hg / hgrc

diff --git a/dotfiles/hg/hgrc b/dotfiles/hg/hgrc
index 6a3fa0b117bf09cdc4ef8f32ecdf44a2c7ca32bb..14bad3f20486f5a2478375d72cea854c1c738673 100644 (file)
--- a/dotfiles/hg/hgrc
+++ b/dotfiles/hg/hgrc
@@ -5,8 +5,10 @@ editor = vim
 ssh = ssh -C
 
 [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 =