[PATCH] resolve: add file codes to doc string

Adrian Buehlmann adrian at cadifra.com
Sat May 31 04:43:18 CDT 2008


# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1212226675 -7200
# Node ID c8c7248f6172a2f861b87ba0e475676a57198636
# Parent  1603bba96411ce4608d7653bc1f3d6058ddf2db2
resolve: add file codes to doc string

diff -r 1603bba96411 -r c8c7248f6172 mercurial/commands.py
--- 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:


More information about the Mercurial-devel mailing list