Mercurial > hg

diff tests/test-rebase-obsolete.t @ 39099:3f9a5d746cf6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: consolidate check for --dry-run/--confirm on abort/stop/continue
author Yuya Nishihara <yuya@tcha.org>
date Wed, 15 Aug 2018 10:41:26 +0900
parents a42506059522
children 63aa928be559
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t	Wed Aug 15 10:36:06 2018 +0900
+++ b/tests/test-rebase-obsolete.t	Wed Aug 15 10:41:26 2018 +0900
@@ -2012,7 +2012,7 @@
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
   $ hg rebase --stop --dry-run
-  abort: cannot use --stop with --dry-run or --confirm
+  abort: cannot specify both --dry-run and --stop
   [255]
 
   $ hg rebase -s 3 -d 5