Mercurial > hg-stable

diff tests/test-rebase-obsolete.t @ 39135:a42506059522

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: consolidate check for --abort/--stop/--continue conflicts
author Yuya Nishihara <yuya@tcha.org>
date Wed, 15 Aug 2018 10:36:06 +0900
parents 33f5cffe725f
children 3f9a5d746cf6
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t	Wed Aug 15 10:32:10 2018 +0900
+++ b/tests/test-rebase-obsolete.t	Wed Aug 15 10:36:06 2018 +0900
@@ -2020,7 +2020,7 @@
   (use 'hg rebase --continue' or 'hg rebase --abort')
   [255]
   $ hg rebase --stop --continue
-  abort: cannot use --stop with --abort or --continue
+  abort: cannot use --stop with --continue
   [255]
 
 Test --stop moves bookmarks of original revisions to new rebased nodes: