diff hgext/evolve.py @ 1045:b346d7a3d89e

doc: forgotten amend
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 08 Aug 2014 21:06:48 -0700
parents c878deb2fd73
children 296d48e1f55a
line wrap: on
line diff
--- a/hgext/evolve.py	Thu Jun 12 14:41:13 2014 -0700
+++ b/hgext/evolve.py	Fri Aug 08 21:06:48 2014 -0700
@@ -1152,7 +1152,8 @@
     [('n', 'dry-run', False,
         'do not perform actions, just print what would be done'),
     ('A', 'any', False, 'also consider troubled changesets unrelated to current working directory'),
-    ('a', 'all', False, 'evolve all troubled changesets (implies any)'),
+    ('a', 'all', False, 'evolve all troubled changesets in the repo '
+                        '(implies any)'),
     ('c', 'continue', False, 'continue an interrupted evolution'),
     ] + mergetoolopts,
     _('[OPTIONS]...'))
@@ -1166,7 +1167,7 @@
       obsolete
 
     By default a single changeset is evolved for each invocation and only
-    troubles changesets that would evolve as a descendant of the current
+    troubled changesets that would evolve as a descendant of the current
     working directory will be considered. See --all and --any options to change
     this behavior.