| branch | stable |
| changeset 13541 | 919174c0aaff |
| parent 12896 | b19b4c1df066 |
| child 15501 | 2371f4aea665 |
| 13534:4ec34de8bbb1 | 13541:919174c0aaff |
|---|---|
63 [255] |
63 [255] |
64 |
64 |
65 Try to continue without solving the conflict: |
65 Try to continue without solving the conflict: |
66 |
66 |
67 $ hg rebase --continue |
67 $ hg rebase --continue |
68 abort: unresolved merge conflicts (see hg resolve) |
68 abort: unresolved merge conflicts (see hg help resolve) |
69 [255] |
69 [255] |
70 |
70 |
71 Conclude rebase: |
71 Conclude rebase: |
72 |
72 |
73 $ echo 'resolved merge' >common |
73 $ echo 'resolved merge' >common |