From: Stefan Huber <s.huber@bct-electronic.com>
Date: Thu, 15 Nov 2012 10:02:31 +0000 (+0100)
Subject: Merge branch 'master' of ssh://aristoteles.sthu.org:2407/~/gitweb/shutils
X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=0fdcd43f716bd3c0c29c189df1a54c88d0ac015c;p=shutils.git

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

0fdcd43f716bd3c0c29c189df1a54c88d0ac015c
diff --cc dotfiles/hg/hgrc
index 6a3fa0b,87acaae..14bad3f
--- a/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 =