# HG changeset patch
# User David Champion <dgc@uchicago.edu>
# Date 1271869371 18000
# Node ID bdc8f048166ee4576daae0d7b6d403df64a0da48
# Parent  523330d567cfe5d0222d2d64d95c4a9b71a88e92
give worst-case 'merge' merge-tool lowest priority

Another tool had -10 already.  Since 'merge' is clearly a worst-case
tool (internal), lowering to -100 ensures there's plenty of room for
slightly better cases.

diff -r 523330d567cf -r bdc8f048166e contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc	Wed Apr 21 11:57:45 2010 -0500
+++ b/contrib/mergetools.hgrc	Wed Apr 21 12:02:51 2010 -0500
@@ -13,7 +13,7 @@
 gvimdiff.priority=-9
 
 merge.checkconflicts=True
-merge.priority=-10
+merge.priority=-100
 
 gpyfm.gui=True