equal
deleted
inserted
replaced
18 created new head |
18 created new head |
19 merging a |
19 merging a |
20 warning: conflicts during merge. |
20 warning: conflicts during merge. |
21 merging a failed! |
21 merging a failed! |
22 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
22 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
23 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
23 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
24 M a |
24 M a |
25 ? a.orig |
25 ? a.orig |
26 % should fail |
26 % should fail |
27 a already tracked! |
27 a already tracked! |
28 M a |
28 M a |