changeset 33139 | 40ee74bfa111 |
parent 33056 | 2312e70cf78b |
parent 33120 | b63351f6a246 |
child 33332 | 3b7cb3d17137 |
--- a/tests/test-rebase-scenario-global.t Wed Jun 28 17:41:25 2017 +0200 +++ b/tests/test-rebase-scenario-global.t Thu Jun 29 15:21:52 2017 -0700 @@ -271,8 +271,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