equal
deleted
inserted
replaced
67 |
67 |
68 $ hg rebase -s 1 -d 4 --keep |
68 $ hg rebase -s 1 -d 4 --keep |
69 merging A |
69 merging A |
70 warning: conflicts during merge. |
70 warning: conflicts during merge. |
71 merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
71 merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
72 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
72 unresolved conflicts (see hg resolve, then hg rebase --continue) |
73 [255] |
73 [255] |
74 |
74 |
75 Solve the conflict and go on: |
75 Solve the conflict and go on: |
76 |
76 |
77 $ echo 'conflict solved' > A |
77 $ echo 'conflict solved' > A |
120 |
120 |
121 $ hg rebase -s 5 -d 4 --keepbranches |
121 $ hg rebase -s 5 -d 4 --keepbranches |
122 merging A |
122 merging A |
123 warning: conflicts during merge. |
123 warning: conflicts during merge. |
124 merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
124 merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
125 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
125 unresolved conflicts (see hg resolve, then hg rebase --continue) |
126 [255] |
126 [255] |
127 |
127 |
128 Solve the conflict and go on: |
128 Solve the conflict and go on: |
129 |
129 |
130 $ echo 'conflict solved' > A |
130 $ echo 'conflict solved' > A |