52   merging a

    52   merging a

    53   warning: conflicts during merge.

    53   warning: conflicts during merge.

    54   merging a failed!

    54   merging a failed!

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

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

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

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

    57   $ hg st

    58   $ hg st

    58   M a

    59   M a

    59   ? a.orig

    60   ? a.orig

    60 

    61 

    61 should fail

    62 should fail

    84   M a

    85   M a

    85   ? a.orig

    86   ? a.orig

    86 

    87 

    87   $ hg add c && echo "unexpected addition of missing file"

    88   $ hg add c && echo "unexpected addition of missing file"

    88   c: No such file or directory

    89   c: No such file or directory

    89   $ echo c > c

    91   $ echo c > c

    90   $ hg add d c && echo "unexpected addition of missing file"

    92   $ hg add d c && echo "unexpected addition of missing file"

    91   d: No such file or directory

    93   d: No such file or directory

    92   $ hg st

    95   $ hg st

    93   M a

    96   M a

    94   A c

    97   A c

    95   ? a.orig

    98   ? a.orig

    96 

    99