--- a/mercurial/commands.py	Thu May 29 22:23:33 2008 +0200
+++ b/mercurial/commands.py	Sat May 31 11:37:55 2008 +0200
@@ -2252,6 +2252,10 @@
     revision preserved at the last update or merge to cleanly retry
     the file merge attempt. With no file or options specified, this
     command will attempt to resolve all unresolved files.
+
+    The codes used to show the status of files are:
+    U = unresolved
+    R = resolved
     """
 
     if len([x for x in opts if opts[x]]) > 1: