diff -r 9ea7238ad935 -r 5f091fc1bab7 mercurial/commands.py
--- a/mercurial/commands.py	Thu Mar 11 15:52:17 2010 +0100
+++ b/mercurial/commands.py	Thu Mar 11 17:43:44 2010 +0100
@@ -13,7 +13,7 @@
 import patch, help, mdiff, url, encoding, templatekw
 import archival, changegroup, cmdutil, sshserver, hbisect
 from hgweb import server, hgweb_mod, hgwebdir_mod
-import merge as merge_
+import merge as mergemod
 import minirst
 
 # Commands start here, listed alphabetically
@@ -2596,7 +2596,7 @@
         raise util.Abort(_('no files or directories specified; '
                            'use --all to remerge all files'))
 
-    ms = merge_.mergestate(repo)
+    ms = mergemod.mergestate(repo)
     m = cmdutil.match(repo, pats, opts)
 
     for f in ms:
@@ -3083,7 +3083,7 @@
         ui.status(m)
 
     st = list(repo.status(unknown=True))[:6]
-    ms = merge_.mergestate(repo)
+    ms = mergemod.mergestate(repo)
     st.append([f for f in ms if ms[f] == 'u'])
     labels = [_('%d modified'), _('%d added'), _('%d removed'),
               _('%d deleted'), _('%d unknown'), _('%d ignored'),