diff mercurial/commands.py @ 22315:188b8aa2120b

merge with crew
author Matt Mackall <mpm@selenic.com>
date Sat, 30 Aug 2014 18:44:59 +0200
parents 5038dee5bdd6 6a8b8efb0641
children c5df4af17110
line wrap: on
line diff
--- 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.