Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: add file codes to doc string
authorAdrian Buehlmann <adrian@cadifra.com>
Sat, 31 May 2008 11:37:55 +0200
changeset 6642 c8c7248f6172
parent 6641 1603bba96411
child 6643 635541b970e5
resolve: add file codes to doc string
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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:
hg-stable