# HG changeset patch # User Kyle Lippincott # Date 1564073981 25200 # Node ID c1d0faaa5b92f8a9a8405527f8667b0b2c49f665 # Parent 3968f6d58591562543f0b008b7f8aa1b3f8b65d2 prune: fix small grammatical issues in help text diff -r 3968f6d58591 -r c1d0faaa5b92 hgext3rd/evolve/cmdrewrite.py --- a/hgext3rd/evolve/cmdrewrite.py Fri Jul 19 17:40:45 2019 +0800 +++ b/hgext3rd/evolve/cmdrewrite.py Thu Jul 25 09:59:41 2019 -0700 @@ -966,9 +966,9 @@ "(pairing multiple precursors to multiple successors)")), ('', 'biject', False, _("alias to --pair (DEPRECATED)")), ('', 'fold', False, - _("record a fold (multiple precursors, one successors)")), + _("record a fold (multiple precursors, one successor)")), ('', 'split', False, - _("record a split (on precursor, multiple successors)")), + _("record a split (one precursor, multiple successors)")), ('B', 'bookmark', [], _("remove revs only reachable from given" " bookmark"), _('BOOKMARK'))] + metadataopts, _('[OPTION] [-r] REV...'), @@ -994,10 +994,10 @@ passing ``--split``. Similarly, when you prune multiple changesets with a single successor, you must pass the ``--fold`` option. - If you want to supersede multiple revisions at the same time, use + If you want to supersede multiple revisions at the same time, use the ``--pair`` option to pair the pruned precursor and successor changesets. This is commonly useful for resolving history divergence, or when someone - else does edits history without obsolescence enabled. + else edits history without obsolescence enabled. """ _checknotesize(ui, opts) revs = scmutil.revrange(repo, list(revs) + opts.get('rev'))