# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1326462767 -3600
# Node ID 6bed6cc6d0d009a88e6409cf962b5e15c4bc3ba6
# Parent  09757185ce97d05613d17d28e0bf8f33aade95d0
commands: partial backout of fbb68b382040

diff -r 09757185ce97 -r 6bed6cc6d0d0 mercurial/commands.py
--- a/mercurial/commands.py	Fri Jan 13 11:53:51 2012 +0100
+++ b/mercurial/commands.py	Fri Jan 13 14:52:47 2012 +0100
@@ -14,7 +14,7 @@
 import archival, changegroup, cmdutil, hbisect
 import sshserver, hgweb, hgweb.server, commandserver
 import match as matchmod
-import merge
+import merge as mergemod
 import minirst, revset, fileset
 import dagparser, context, simplemerge
 import random, setdiscovery, treediscovery, dagutil
@@ -2623,8 +2623,8 @@
             try:
                 # ui.forcemerge is an internal variable, do not document
                 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
-                stats = merge.update(repo, ctx.node(), True, True, False,
-                                     ctx.p1().node())
+                stats = mergemod.update(repo, ctx.node(), True, True, False,
+                                        ctx.p1().node())
             finally:
                 ui.setconfig('ui', 'forcemerge', '')
             # drop the second merge parent
@@ -4655,7 +4655,7 @@
         raise util.Abort(_('no files or directories specified; '
                            'use --all to remerge all files'))
 
-    ms = merge.mergestate(repo)
+    ms = mergemod.mergestate(repo)
     m = scmutil.match(repo[None], pats, opts)
     ret = 0
 
@@ -5352,7 +5352,7 @@
     st.insert(3, renamed)
     st.insert(4, copied)
 
-    ms = merge.mergestate(repo)
+    ms = mergemod.mergestate(repo)
     st.append([f for f in ms if ms[f] == 'u'])
 
     subs = [s for s in ctx.substate if ctx.sub(s).dirty()]