mercurial/filemerge.py

--- a/mercurial/filemerge.py	Wed Oct 20 20:19:34 2010 +0200
+++ b/mercurial/filemerge.py	Tue Oct 19 22:33:52 2010 -0500
@@ -54,7 +54,17 @@
             return True
         return False
 
-    # HGMERGE takes precedence
+    # forcemerge comes from command line arguments, highest priority
+    force = ui.config('ui', 'forcemerge')
+    if force:
+        toolpath = _findtool(ui, force)
+        if toolpath:
+            return (force, '"' + toolpath + '"')
+        else:
+            # mimic HGMERGE if given tool not found
+            return (force, force)
+
+    # HGMERGE takes next precedence
     hgmerge = os.environ.get("HGMERGE")
     if hgmerge:
         return (hgmerge, hgmerge)