equal
deleted
inserted
replaced
32 |
32 |
33 Correct the conflict without marking the file as resolved |
33 Correct the conflict without marking the file as resolved |
34 |
34 |
35 $ echo "ABCD" > A |
35 $ echo "ABCD" > A |
36 $ hg commit -m "Merged" |
36 $ hg commit -m "Merged" |
37 abort: unresolved merge conflicts (see "hg help resolve") |
37 abort: unresolved merge conflicts (see 'hg help resolve') |
38 [255] |
38 [255] |
39 |
39 |
40 Mark the conflict as resolved and commit |
40 Mark the conflict as resolved and commit |
41 |
41 |
42 $ hg resolve -m A |
42 $ hg resolve -m A |
54 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
54 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
55 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
55 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
56 [1] |
56 [1] |
57 $ hg rm --force A |
57 $ hg rm --force A |
58 $ hg commit -m merged |
58 $ hg commit -m merged |
59 abort: unresolved merge conflicts (see "hg help resolve") |
59 abort: unresolved merge conflicts (see 'hg help resolve') |
60 [255] |
60 [255] |
61 |
61 |
62 $ hg resolve -ma |
62 $ hg resolve -ma |
63 (no more unresolved files) |
63 (no more unresolved files) |
64 $ hg commit -m merged |
64 $ hg commit -m merged |