equal
deleted
inserted
replaced
64 $ hg rebase -s 3 -d 2 |
64 $ hg rebase -s 3 -d 2 |
65 merging common |
65 merging common |
66 warning: conflicts during merge. |
66 warning: conflicts during merge. |
67 merging common incomplete! (edit conflicts, then use 'hg resolve --mark') |
67 merging common incomplete! (edit conflicts, then use 'hg resolve --mark') |
68 unresolved conflicts (see hg resolve, then hg rebase --continue) |
68 unresolved conflicts (see hg resolve, then hg rebase --continue) |
69 [255] |
69 [1] |
70 |
70 |
71 Try to continue without solving the conflict: |
71 Try to continue without solving the conflict: |
72 |
72 |
73 $ hg rebase --continue |
73 $ hg rebase --continue |
74 abort: unresolved merge conflicts (see hg help resolve) |
74 abort: unresolved merge conflicts (see hg help resolve) |