equal
deleted
inserted
replaced
84 $ hg evolve |
84 $ hg evolve |
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 abort: fix conflicts and see `hg help evolve.interrupted` |
90 see `hg help evolve.interrupted` |
|
91 abort: unresolved merge conflicts (see hg help resolve) |
|
92 [255] |
90 [255] |
93 |
91 |
94 $ hg diff |
92 $ hg diff |
95 diff -r 87495ea7c9ec a |
93 diff -r 87495ea7c9ec a |
96 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
94 --- a/a Thu Jan 01 00:00:00 1970 +0000 |