equal
deleted
inserted
replaced
51 $ hg merge |
51 $ hg merge |
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 |
57 $ hg st |
58 M a |
58 M a |
59 ? a.orig |
59 ? a.orig |
60 |
60 |
61 should fail |
61 should fail |