1 adding bar

     2 adding foo

     3 adding quux1

     4 adding quux2

     5 merging bar

     6 merging bar failed!

     7 merging foo and baz

     8 merging foo failed!

     9 1 files updated, 0 files merged, 0 files removed, 2 files unresolved

    10 There are unresolved merges, you can redo the full merge using:

    11   hg update -C 2

    12   hg merge 1

    13 3 files updated, 0 files merged, 1 files removed, 0 files unresolved

    14 merging bar

    15 merging bar failed!

    16 merging baz and foo

    17 merging baz failed!

    18 1 files updated, 0 files merged, 0 files removed, 2 files unresolved

    19 There are unresolved merges, you can redo the full merge using:

    20   hg update -C 1

    21   hg merge 2