equal
deleted
inserted
replaced
125 |
125 |
126 $ hg status |
126 $ hg status |
127 |
127 |
128 cleaning up things for next testing |
128 cleaning up things for next testing |
129 |
129 |
130 $ hg evolve --all |
130 $ hg evolve --all --update |
131 move:[4] added d |
131 move:[4] added d |
132 atop:[5] added c |
132 atop:[5] added c |
133 merging d |
133 merging d |
134 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
134 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
135 fix conflicts and see `hg help evolve.interrupted` |
135 fix conflicts and see `hg help evolve.interrupted` |