equal
deleted
inserted
replaced
205 |
205 |
206 $ hg evolve --phase-divergent --all |
206 $ hg evolve --phase-divergent --all |
207 recreate:[7] added d |
207 recreate:[7] added d |
208 atop:[4] added d |
208 atop:[4] added d |
209 rebasing to destination parent: ca1b80f7960a |
209 rebasing to destination parent: ca1b80f7960a |
210 computing new diff |
210 no changes to commit |
211 committed as c41c793e0ef1 |
|
212 recreate:[9] added c |
211 recreate:[9] added c |
213 atop:[3] added c |
212 atop:[3] added c |
214 rebasing to destination parent: b1661037fa25 |
213 rebasing to destination parent: b1661037fa25 |
215 merging b |
214 merging b |
216 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
215 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
290 $ hg resolve -m |
289 $ hg resolve -m |
291 (no more unresolved files) |
290 (no more unresolved files) |
292 continue: hg evolve --continue |
291 continue: hg evolve --continue |
293 $ hg evolve --continue |
292 $ hg evolve --continue |
294 evolving 9:28cd06b3f801 "added c" |
293 evolving 9:28cd06b3f801 "added c" |
295 computing new diff |
|
296 committed as 95d746965290 |
294 committed as 95d746965290 |
297 recreate:[10] added d |
295 recreate:[10] added d |
298 atop:[4] added d |
296 atop:[4] added d |
299 rebasing to destination parent: ca1b80f7960a |
297 rebasing to destination parent: ca1b80f7960a |
300 merging c |
298 merging c |