[PATCH 4 of 5] merge: Add method to force merge tool

[S. Heimberg]

# HG changeset patch
# User simohe at besonet.ch
# Date 1218044866 -7200
# Node ID 44bdc2e3a7dcd38f6448d4118c355004eef22bc2
# Parent  3a744f6d573a9ab00e9ac60365c48d640e207dc1
merge: Add method to force merge tool

diff -r 3a744f6d573a -r 44bdc2e3a7dc mercurial/merge.py
--- a/mercurial/merge.py	Sat Aug 02 21:02:46 2008 +0200
+++ b/mercurial/merge.py	Wed Aug 06 19:47:46 2008 +0200
@@ -493,3 +493,13 @@
         return stats
     finally:
         del wlock
+
+def setmergetool(tool):
+    """
+    sets the merge tool
+    """
+
+    if tool:
+        if os.environ.get('HGMERGE'):
+            ui.verbose(_('environment variable HGMERGE overwritten with
%s') % tool)
+        os.environ['HGMERGE'] = tool