# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 2010-07-03 00:15:25
# Node ID 48e549d7c6ae471e53806c75f3ed16f4f706234a
# Parent  e5dd08f3fa0354dd0adde63848ac177cf2bcb433

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/

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