equal
deleted
inserted
replaced
59 $ hg evolve |
59 $ hg evolve |
60 move:[2] c |
60 move:[2] c |
61 atop:[3] b |
61 atop:[3] b |
62 merging a |
62 merging a |
63 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
63 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
64 fix conflicts and see `hg help evolve.interrupted` |
64 unresolved merge conflicts |
|
65 (see 'hg help evolve.interrupted') |
65 [1] |
66 [1] |
66 |
67 |
67 Fix the conflict |
68 Fix the conflict |
68 $ echo c2 > a |
69 $ echo c2 > a |
69 $ hg resolve -m |
70 $ hg resolve -m |