merge with i18n stable
authorWagner Bruna <wbruna@softwareexpress.com.br>
Mon, 01 Sep 2014 10:54:49 -0300
branchstable
changeset 22320 e46a0d561229
parent 22314 6a8b8efb0641 (diff)
parent 22319 77f3c3c5d4a1 (current diff)
child 22321 737b2bea97f8
merge with i18n
--- a/mercurial/commands.py	Sun Aug 31 20:49:13 2014 +0900
+++ b/mercurial/commands.py	Mon Sep 01 10:54:49 2014 -0300
@@ -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.