Mercurial > hg

diff tests/test-rebase-inmemory.t @ 45215:a253ded5b03d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
morestatus: mention --stop even if not using --verbose Differential Revision: https://phab.mercurial-scm.org/D8811
author Kyle Lippincott <spectral@google.com>
date Thu, 23 Jul 2020 13:31:45 -0700
parents dc5e5577af39
children 5780a04a1b46
line wrap: on
line diff
--- a/tests/test-rebase-inmemory.t	Fri Jul 24 11:24:59 2020 -0700
+++ b/tests/test-rebase-inmemory.t	Thu Jul 23 13:31:45 2020 -0700
@@ -901,7 +901,7 @@
   [1]
   $ hg rebase -r 3 -d 1 -t:merge3
   abort: rebase in progress
-  (use 'hg rebase --continue' or 'hg rebase --abort')
+  (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
   [255]
   $ hg resolve --list
   U foo