changeset 31514 | 2519994d25ca |
parent 31302 | 681046de87f1 |
child 33055 | be3584712b20 |
child 33120 | b63351f6a246 |
--- a/tests/test-rebase-scenario-global.t Fri Mar 10 15:52:29 2017 -0800 +++ b/tests/test-rebase-scenario-global.t Sun Mar 19 11:54:15 2017 -0700 @@ -270,6 +270,8 @@ $ 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