equal
deleted
inserted
replaced
67 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
67 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
68 [255] |
68 [255] |
69 |
69 |
70 Try to continue without solving the conflict: |
70 Try to continue without solving the conflict: |
71 |
71 |
72 $ hg rebase --continue |
72 $ hg rebase --continue |
73 abort: unresolved merge conflicts (see hg help resolve) |
73 abort: unresolved merge conflicts (see hg help resolve) |
74 [255] |
74 [255] |
75 |
75 |
76 Conclude rebase: |
76 Conclude rebase: |
77 |
77 |