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