equal
deleted
inserted
replaced
85 move:[2] c |
85 move:[2] c |
86 atop:[3] b |
86 atop:[3] b |
87 merging a |
87 merging a |
88 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
88 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
89 evolve failed! |
89 evolve failed! |
90 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
90 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
91 abort: unresolved merge conflicts (see hg help resolve) |
91 abort: unresolved merge conflicts (see hg help resolve) |
92 [255] |
92 [255] |
93 |
93 |
94 $ hg diff |
94 $ hg diff |
95 diff -r 87495ea7c9ec a |
95 diff -r 87495ea7c9ec a |