equal
deleted
inserted
replaced
87 |
87 |
88 Try to continue without solving the conflict: |
88 Try to continue without solving the conflict: |
89 |
89 |
90 $ hg rebase --continue |
90 $ hg rebase --continue |
91 abort: unresolved merge conflicts (see 'hg help resolve') |
91 abort: unresolved merge conflicts (see 'hg help resolve') |
92 [255] |
92 [20] |
93 |
93 |
94 Conclude rebase: |
94 Conclude rebase: |
95 |
95 |
96 $ echo 'resolved merge' >common |
96 $ echo 'resolved merge' >common |
97 $ hg resolve -m common |
97 $ hg resolve -m common |