equal
deleted
inserted
replaced
160 |/ |
160 |/ |
161 o 0:public 'A' |
161 o 0:public 'A' |
162 |
162 |
163 $ hg rebase -b 4 -d 2 |
163 $ hg rebase -b 4 -d 2 |
164 rebasing 3:a6484957d6b9 "B bis" |
164 rebasing 3:a6484957d6b9 "B bis" |
|
165 note: rebase of 3:a6484957d6b9 created no changes to commit |
165 rebasing 4:145842775fec "C1" (tip) |
166 rebasing 4:145842775fec "C1" (tip) |
166 merging c |
167 merging c |
167 warning: conflicts during merge. |
168 warning: conflicts during merge. |
168 merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
169 merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
169 unresolved conflicts (see hg resolve, then hg rebase --continue) |
170 unresolved conflicts (see hg resolve, then hg rebase --continue) |