equal
deleted
inserted
replaced
189 |
189 |
190 Making sure obsmarkers should be on evolved changeset and not rest of them once |
190 Making sure obsmarkers should be on evolved changeset and not rest of them once |
191 we do `evolve --stop` |
191 we do `evolve --stop` |
192 -------------------------------------------------------------------------------- |
192 -------------------------------------------------------------------------------- |
193 |
193 |
194 $ hg evolve |
194 $ hg evolve --update |
195 move:[4] added d |
195 move:[4] added d |
196 atop:[5] added c |
196 atop:[5] added c |
197 merging d |
197 merging d |
198 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
198 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
199 fix conflicts and see `hg help evolve.interrupted` |
199 fix conflicts and see `hg help evolve.interrupted` |