--- 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