merge with crew
authorMatt Mackall <mpm@selenic.com>
Sat, 30 Aug 2014 18:44:59 +0200
changeset 22315 188b8aa2120b
parent 22313 d226fe36e362 (current diff)
parent 22314 6a8b8efb0641 (diff)
child 22323 b31d29b2a7f2
merge with crew
mercurial/commands.py
--- a/mercurial/commands.py	Sat Aug 30 05:29:38 2014 -0700
+++ b/mercurial/commands.py	Sat Aug 30 18:44:59 2014 +0200
@@ -818,8 +818,8 @@
     Deleting or moving a bookmark has no effect on the associated changesets.
 
     Creating or updating to a bookmark causes it to be marked as 'active'.
-    Active bookmarks are indicated with a '*'.
-    When a commit is made, an active bookmark will advance to the new commit.
+    The active bookmark is indicated with a '*'.
+    When a commit is made, the active bookmark will advance to the new commit.
     A plain :hg:`update` will also advance an active bookmark, if possible.
     Updating away from a bookmark will cause it to be deactivated.