equal
deleted
inserted
replaced
281 with: [6] added d |
281 with: [6] added d |
282 base: [4] added d |
282 base: [4] added d |
283 rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a |
283 rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a |
284 merging c |
284 merging c |
285 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
285 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
286 abort: unresolved merge conflicts (see hg help resolve) |
286 fix conflicts and see `hg help evolve.interrupted` |
287 [255] |
287 [1] |
288 |
288 |
289 $ hg evolve --abort |
289 $ hg evolve --abort |
290 evolve aborted |
290 evolve aborted |
291 working directory is now at e49523854bc8 |
291 working directory is now at e49523854bc8 |
292 |
292 |