equal
deleted
inserted
replaced
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 [1] |
35 |
36 |
36 Correct the conflict without marking the file as resolved |
37 Correct the conflict without marking the file as resolved |
37 |
38 |
38 $ echo "ABCD" > A |
39 $ echo "ABCD" > A |
39 $ hg commit -m "Merged" |
40 $ hg commit -m "Merged" |
40 abort: unresolved merge conflicts (see hg resolve) |
41 abort: unresolved merge conflicts (see hg resolve) |
|
42 [255] |
41 |
43 |
42 Mark the conflict as resolved and commit |
44 Mark the conflict as resolved and commit |
43 |
45 |
44 $ hg resolve -m A |
46 $ hg resolve -m A |
45 $ hg commit -m "Merged" |
47 $ hg commit -m "Merged" |