equal
deleted
inserted
replaced
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 computing new diff |
211 committed as c41c793e0ef1 |
211 no changes to commit |
212 recreate:[9] added c |
212 recreate:[9] added c |
213 atop:[3] added c |
213 atop:[3] added c |
214 rebasing to destination parent: b1661037fa25 |
214 rebasing to destination parent: b1661037fa25 |
215 merging b |
215 merging b |
216 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
216 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |