1 1:dfab7f3c2efb

     2 0:c3fa057dd86f

     3 dfab7f3c2efb tip

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

     5 c3fa057dd86f

     6 c3fa057dd86f+

     7 reverting file1

     8 c3fa057dd86f

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

    10 dfab7f3c2efb tip

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

    12 merging file1

    13 warning: conflicts during merge.

    14 merging file1 failed!

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

    16 use 'hg resolve' to retry unresolved file merges

    17 diff -r dfab7f3c2efb file1

    18 --- a/file1

    19 +++ b/file1

    20 @@ -1,3 +1,7 @@

    21  added file1

    22  another line of text

    23 +<<<<<<< local

    24 +changed file1 different

    25 +=======

    26  changed file1

    27 +>>>>>>> other

    28 M file1

    29 ? file1.orig

    30 dfab7f3c2efb+ tip

    31 reverting file1

    32 ? file1.orig

    33 dfab7f3c2efb tip

    34 ? file1.orig

    35 dfab7f3c2efb tip

    36 0 files updated, 0 files merged, 0 files removed, 0 files unresolved

    37 ? file1.orig

    38 dfab7f3c2efb tip