# HG changeset patch
# User Adrian Buehlmann <adrian@cadifra.com>
# Date 2008-05-31 09:37:55
# Node ID c8c7248f6172a2f861b87ba0e475676a57198636
# Parent  1603bba96411ce4608d7653bc1f3d6058ddf2db2

resolve: add file codes to doc string

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2252,6 +2252,10 @@ def resolve(ui, repo, *pats, **opts):
     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: