# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1564393214 -7200
# Node ID 9ae3a1d71d4b2afc2d8ecdcc135ea76f232b3d6d
# Parent  7e0bc48c9f4926a744a918114bfb15c5dab1bef0# Parent  c1d0faaa5b92f8a9a8405527f8667b0b2c49f665
test-compat: merge stable into mercurial-5.0

diff -r 7e0bc48c9f49 -r 9ae3a1d71d4b hgext3rd/evolve/cmdrewrite.py
--- a/hgext3rd/evolve/cmdrewrite.py	Thu Jul 25 18:29:59 2019 +0200
+++ b/hgext3rd/evolve/cmdrewrite.py	Mon Jul 29 11:40:14 2019 +0200
@@ -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'))