equal
deleted
inserted
replaced
72 Try to continue without solving the conflict: |
72 Try to continue without solving the conflict: |
73 |
73 |
74 $ hg rebase --continue |
74 $ hg rebase --continue |
75 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb |
75 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb |
76 rebasing 4:46f0b057b5c0 "L2" |
76 rebasing 4:46f0b057b5c0 "L2" |
77 abort: unresolved merge conflicts (see hg help resolve) |
77 abort: unresolved merge conflicts (see "hg help resolve") |
78 [255] |
78 [255] |
79 |
79 |
80 Conclude rebase: |
80 Conclude rebase: |
81 |
81 |
82 $ echo 'resolved merge' >common |
82 $ echo 'resolved merge' >common |