branch | stable |
changeset 33120 | b63351f6a246 |
parent 31514 | 2519994d25ca |
child 33139 | 40ee74bfa111 |
--- a/tests/test-rebase-scenario-global.t Fri Jun 23 13:33:41 2017 +0800 +++ b/tests/test-rebase-scenario-global.t Tue Jun 27 17:39:55 2017 +0200 @@ -270,8 +270,6 @@ $ hg rebase -s 6 -d 1 rebasing 6:eea13746799a "G" - transaction abort! - rollback completed abort: cannot use revision 6 as base, result would have 3 parents [255] $ hg rebase --abort