changeset 39136 | 3f9a5d746cf6 |
parent 39135 | a42506059522 |
child 39353 | 63aa928be559 |
--- 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