23   $ echo a >> a

    23   $ echo a >> a

    24   $ hg ci -m changea

    24   $ hg ci -m changea

    25   $ hg bookmark changea

    25   $ hg bookmark changea

    26   $ hg up 1

    26   $ hg up 1

    27   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    27   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    28   $ echo a >> a

    29   $ echo a >> a

    29   $ hg amend -m changea

    30   $ hg amend -m changea

    30   1 new unstable changesets

    31   1 new unstable changesets

    31   $ hg evolve -v

    32   $ hg evolve -v

    32   move:[2] changea

    33   move:[2] changea

    92   $ hg evolve --continue

    93   $ hg evolve --continue

    93   grafting revision 5

    94   grafting revision 5

    94   abort: unresolved merge conflicts (see hg help resolve)

    95   abort: unresolved merge conflicts (see hg help resolve)

    95   [255]

    96   [255]

    96   $ hg resolve -m a

    97   $ hg resolve -m a

    97   $ hg evolve --continue

    99   $ hg evolve --continue

    98   grafting revision 5

   100   grafting revision 5

    99 

   101 

   100 Stabilize of late comer with different parent

   102 Stabilize of late comer with different parent

   101 ==================================================

   103 ==================================================