merge with stable
authorMatt Mackall <mpm@selenic.com>
Wed, 20 Apr 2011 12:44:32 -0500
changeset 13965 ac1c75a7c6b5
parent 13964 616ad3f6fd33 (current diff)
parent 13963 3c753f9a2fbc (diff)
child 13966 a1c31c64bcd3
merge with stable
mercurial/commands.py
--- a/mercurial/commands.py	Tue Apr 19 23:37:06 2011 -0400
+++ b/mercurial/commands.py	Wed Apr 20 12:44:32 2011 -0500
@@ -2344,10 +2344,10 @@
              num=None, id=None, branch=None, tags=None, bookmarks=None):
     """identify the working copy or specified revision
 
-    Print a summary identifiying the repository state at REV
-    using one or two parent hash identifiers, followed by a
-    "+" if there are uncommitted changes in the working directory,
-    the branch name (omitted if default) and a list of tags, bookmarks.
+    Print a summary identifying the repository state at REV using one or
+    two parent hash identifiers, followed by a "+" if the working
+    directory has uncommitted changes, the branch name (if not default),
+    a list of tags, and a list of bookmarks.
 
     When REV is not given, print a summary of the current state of the
     repository.