changeset 46632 | 9989a276712f |
parent 45853 | b4694ef45db5 |
child 46836 | 80cac9936324 |
--- a/tests/test-rebase-scenario-global.t Mon Mar 01 16:54:51 2021 +0100 +++ b/tests/test-rebase-scenario-global.t Fri Jan 29 16:33:12 2021 -0800 @@ -266,14 +266,14 @@ $ hg rebase -s 5 -d 6 abort: source and destination form a cycle - [255] + [10] G onto B - merge revision with both parents not in ancestors of target: $ hg rebase -s 6 -d 1 rebasing 6:eea13746799a "G" abort: cannot rebase 6:eea13746799a without moving at least one of its parents - [255] + [10] $ hg rebase --abort rebase aborted