equal
deleted
inserted
replaced
93 |
93 |
94 $ hg rebase --continue |
94 $ hg rebase --continue |
95 abort: cannot continue inconsistent rebase |
95 abort: cannot continue inconsistent rebase |
96 (use "hg rebase --abort" to clear borken state) |
96 (use "hg rebase --abort" to clear borken state) |
97 [255] |
97 [255] |
|
98 $ hg summary | grep '^rebase: ' |
|
99 rebase: (use "hg rebase --abort" to clear broken state) |
98 $ hg rebase --abort |
100 $ hg rebase --abort |
99 rebase aborted (no revision is removed, only broken state is cleared) |
101 rebase aborted (no revision is removed, only broken state is cleared) |
100 |
102 |
101 $ cd .. |
103 $ cd .. |
102 |
104 |