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

diff --cc dotfiles/hg/hgrc
index 6a3fa0b117bf09cdc4ef8f32ecdf44a2c7ca32bb,87acaae94716a024df990e8068e91232a2cd4a25..14bad3f20486f5a2478375d72cea854c1c738673
--- 1/dotfiles/hg/hgrc
--- 2/dotfiles/hg/hgrc
+++ b/dotfiles/hg/hgrc
@@@ -2,11 -2,12 +2,13 @@@
  username = First Last <me@example.com>
  merge = gvimdiff
  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 =