diff -r 00ea3613f82c -r 15e7c6cee929 mercurial/hg.py
--- a/mercurial/hg.py	Fri Jun 03 12:55:56 2005 -0800
+++ b/mercurial/hg.py	Fri Jun 03 12:56:50 2005 -0800
@@ -210,6 +210,7 @@
     def update(self, files, state):
         ''' current states:
         n  normal
+        m  needs merging
         i  invalid
         r  marked for removal
         a  marked for addition'''
@@ -541,6 +542,8 @@
                             added.append(fn)
                         elif fcmp(fn):
                             changed.append(fn)
+                    elif c[0] == 'm':
+                        changed.append(fn)
                     elif c[0] == 'a':
                         added.append(fn)
                     elif c[0] == 'r':