equal
deleted
inserted
replaced
270 |
270 |
271 $ hg rebase -s 6 -d 1 |
271 $ hg rebase -s 6 -d 1 |
272 rebasing 6:eea13746799a "G" |
272 rebasing 6:eea13746799a "G" |
273 abort: cannot use revision 6 as base, result would have 3 parents |
273 abort: cannot use revision 6 as base, result would have 3 parents |
274 [255] |
274 [255] |
275 |
275 $ hg rebase --abort |
|
276 rebase aborted |
276 |
277 |
277 These will abort gracefully (using --base): |
278 These will abort gracefully (using --base): |
278 |
279 |
279 G onto G - rebase onto same changeset: |
280 G onto G - rebase onto same changeset: |
280 |
281 |