equal
deleted
inserted
replaced
83 $ hg evolve |
83 $ hg evolve |
84 move:[2] c |
84 move:[2] c |
85 atop:[3] b |
85 atop:[3] b |
86 merging a |
86 merging a |
87 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
87 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
88 fix conflicts and see `hg help evolve.interrupted` |
88 unresolved merge conflicts |
|
89 (see 'hg help evolve.interrupted') |
89 [1] |
90 [1] |
90 |
91 |
91 $ hg diff |
92 $ hg diff |
92 diff -r 87495ea7c9ec a |
93 diff -r 87495ea7c9ec a |
93 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
94 --- a/a Thu Jan 01 00:00:00 1970 +0000 |