equal
deleted
inserted
replaced
67 $ hg rebase -s 1 -d 4 --keep |
67 $ hg rebase -s 1 -d 4 --keep |
68 rebasing 1:27547f69f254 "B" |
68 rebasing 1:27547f69f254 "B" |
69 rebasing 2:965c486023db "C" |
69 rebasing 2:965c486023db "C" |
70 merging A |
70 merging A |
71 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
71 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
72 unresolved conflicts (see hg resolve, then hg rebase --continue) |
72 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
73 [1] |
73 [1] |
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 |
124 |
124 |
125 $ hg rebase -s 5 -d 4 --keepbranches |
125 $ hg rebase -s 5 -d 4 --keepbranches |
126 rebasing 5:01e6ebbd8272 "F" (tip) |
126 rebasing 5:01e6ebbd8272 "F" (tip) |
127 merging A |
127 merging A |
128 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
128 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
129 unresolved conflicts (see hg resolve, then hg rebase --continue) |
129 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
130 [1] |
130 [1] |
131 |
131 |
132 Solve the conflict and go on: |
132 Solve the conflict and go on: |
133 |
133 |
134 $ echo 'conflict solved' > A |
134 $ echo 'conflict solved' > A |