Mercurial > hg-stable

diff contrib/mergetools.hgrc @ 11506:48e549d7c6ae
mergetools.hgrc: add vimdiff Imported from deb_specific__mergetools patch in Debians patch queue: http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
author: Martin Geisler <mg@lazybytes.net>
date: Sat, 03 Jul 2010 02:15:25 +0200
parents: 16277f8aca1a
children: a87a0fcb412f
--- a/contrib/mergetools.hgrc	Sat Jul 03 02:06:07 2010 +0200
+++ b/contrib/mergetools.hgrc	Sat Jul 03 02:15:25 2010 +0200
@@ -13,6 +13,9 @@
 gvimdiff.regname=path
 gvimdiff.priority=-9
 
+vimdiff.args=$local $other $base
+vimdiff.priority=-10
+
 merge.checkconflicts=True
 merge.priority=-100
author	Martin Geisler <mg@lazybytes.net>
date	Sat, 03 Jul 2010 02:15:25 +0200
parents	16277f8aca1a
children	a87a0fcb412f