# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1303321472 18000
# Node ID ac1c75a7c6b56a1fe5bcb14563d3a8788afeaddb
# Parent  616ad3f6fd33290dc8b06eab753b1d3604e9e5a1# Parent  3c753f9a2fbcffbc7859d666bf1a86d9702027b0
merge with stable

diff -r 616ad3f6fd33 -r ac1c75a7c6b5 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.