[PATCH 2 of 4] give worst-case 'merge' merge-tool lowest priority

[David Champion]

# HG changeset patch
# User David Champion <dgc at uchicago.edu>
# Date 1271869371 18000
# Node ID 5ef4f7259c7f41af474a48d358eab2bf9c26250c
# Parent  307cbb6e9ff1c12781b5641fcb870dc1e8dd1569
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 307cbb6e9ff1 -r 5ef4f7259c7f 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