Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergetools.hgrc: add vimdiff
authorMartin Geisler <mg@lazybytes.net>
Sat, 03 Jul 2010 02:15:25 +0200
changeset 11506 48e549d7c6ae
parent 11505 e5dd08f3fa03
child 11510 96040c70c9e1
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/
contrib/mergetools.hgrc file | annotate | diff | comparison | revisions 
--- 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
mercurial