1   $ hg init

     2   $ echo "nothing" > a

     3   $ hg add a

     4   $ hg commit -m ancestor -d "1000000 0"

     5   $ echo "something" > a

     6   $ hg commit -m branch1 -d "1000000 0"

     7   $ hg co 0

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

     9   $ echo "something else" > a

    10   $ hg commit -m branch2 -d "1000000 0"

    11   created new head

    12 

    13   $ hg merge 1

    14   merging a

    15   warning: conflicts during merge.

    16   merging a failed!

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

    18   use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon

    19 

    20   $ hg id

    21   e7fe8eb3e180+0d24b7662d3e+ tip

    22 

    23   $ cat a

    24   <<<<<<< local

    25   something else

    26   =======

    27   something

    28   >>>>>>> other

    29 

    30   $ hg status

    31   M a

    32   ? a.orig