Show More
@@ -356,6 +356,7 b' during a rebase (issue4661)' | |||||
356 | commit: (clean) |
|
356 | commit: (clean) | |
357 | update: 1 new changesets, 2 branch heads (merge) |
|
357 | update: 1 new changesets, 2 branch heads (merge) | |
358 | phases: 4 draft |
|
358 | phases: 4 draft | |
|
359 | $ cd .. | |||
359 |
|
360 | |||
360 | test aborting a rebase succeeds after rebasing with skipped commits onto a |
|
361 | test aborting a rebase succeeds after rebasing with skipped commits onto a | |
361 | public changeset (issue4896) |
|
362 | public changeset (issue4896) | |
@@ -389,4 +390,5 b' commit will cause merge conflict on reba' | |||||
389 | [1] |
|
390 | [1] | |
390 | $ hg rebase --abort |
|
391 | $ hg rebase --abort | |
391 | rebase aborted |
|
392 | rebase aborted | |
|
393 | $ cd .. | |||
392 |
|
394 |
General Comments 0
You need to be logged in to leave comments.
Login now