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

[S. Heimberg]

# HG changeset patch
# User Simon Heimberg <simohe at besonet.ch>
# Date 1218132949 -7200
# Node ID dec9551b8b6f90113d270bd402ae5b7dbcb7fb7b
# Parent  d1eeddc101e1f53443ef779cf46b4590f75fe329
merge: Add method to force merge tool

diff -r d1eeddc101e1 -r dec9551b8b6f mercurial/merge.py
--- a/mercurial/merge.py	Thu Aug 07 19:06:39 2008 +0200
+++ b/mercurial/merge.py	Thu Aug 07 20:15:49 2008 +0200
@@ -493,3 +493,11 @@
         return stats
     finally:
         del wlock
+
+def setmergetool(tool):
+    """
+    sets the merge tool
+    """
+
+    if tool:
+        os.environ['HGMERGE'] = tool