From: Stefan Huber 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;hp=c4070818c6c1b2fe14edf739ed79d088a835caab;p=shutils.git Merge branch 'master' of ssh://aristoteles.sthu.org:2407/~/gitweb/shutils --- diff --git a/dotfiles/hg/hgrc b/dotfiles/hg/hgrc index 87acaae..14bad3f 100644 --- a/dotfiles/hg/hgrc +++ b/dotfiles/hg/hgrc @@ -2,6 +2,7 @@ username = First Last merge = gvimdiff editor = vim +ssh = ssh -C [merge-tools] splice.executable = gvim