Add vimdiff to mergetools

--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
@@ -13,6 +13,9 @@
 gvimdiff.regname=path
 gvimdiff.priority=-9
 
+vimdiff.args=$local $other $base
+vimdiff.priority=-10
+
 merge.checkconflicts=True
 merge.priority=-100
 
