--- a/hgext/imerge.py	Sun Mar 23 18:52:02 2008 +0100
+++ b/hgext/imerge.py	Sun Mar 23 20:37:02 2008 +0100
@@ -120,7 +120,7 @@
         # this could be greatly improved
         realmerge = os.environ.get('HGMERGE')
         if not interactive:
-            os.environ['HGMERGE'] = 'merge'
+            os.environ['HGMERGE'] = 'internal:merge'
 
         # The filemerge ancestor algorithm does not work if self.wctx
         # already has two parents (in normal merge it doesn't yet). But