| changeset 30273 | 86f4ef63d507 |
| parent 30211 | 6b0741d6d234 |
| child 30460 | ce3a133f71b3 |
| 30272:3d38a0bc774f | 30273:86f4ef63d507 |
|---|---|
71 [1] |
71 [1] |
72 |
72 |
73 Try to continue without solving the conflict: |
73 Try to continue without solving the conflict: |
74 |
74 |
75 $ hg rebase --continue |
75 $ hg rebase --continue |
76 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb |
|
77 rebasing 4:46f0b057b5c0 "L2" |
|
78 abort: unresolved merge conflicts (see 'hg help resolve') |
76 abort: unresolved merge conflicts (see 'hg help resolve') |
79 [255] |
77 [255] |
80 |
78 |
81 Conclude rebase: |
79 Conclude rebase: |
82 |
80 |