equal
deleted
inserted
replaced
29 $ hg merge |
29 $ hg merge |
30 merging A |
30 merging A |
31 warning: conflicts during merge. |
31 warning: conflicts during merge. |
32 merging A failed! |
32 merging A failed! |
33 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
33 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
34 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
34 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
35 |
35 |
36 Correct the conflict without marking the file as resolved |
36 Correct the conflict without marking the file as resolved |
37 |
37 |
38 $ echo "ABCD" > A |
38 $ echo "ABCD" > A |
39 $ hg commit -m "Merged" |
39 $ hg commit -m "Merged" |