equal
deleted
inserted
replaced
41 |
41 |
42 $ hg resolve -m A |
42 $ hg resolve -m A |
43 (no more unresolved files) |
43 (no more unresolved files) |
44 $ hg commit -m "Merged" |
44 $ hg commit -m "Merged" |
45 |
45 |
|
46 Test that if a file is removed but not marked resolved, the commit still fails |
|
47 (issue4972) |
|
48 |
|
49 $ hg up ".^" |
|
50 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
51 $ hg merge 2 |
|
52 merging A |
|
53 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
|
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 |
|
56 [1] |
|
57 $ hg rm --force A |
|
58 $ hg commit -m merged |
|
59 abort: unresolved merge conflicts (see "hg help resolve") |
|
60 [255] |
|
61 |
|
62 $ hg resolve -ma |
|
63 (no more unresolved files) |
|
64 $ hg commit -m merged |
|
65 created new head |
|
66 |
46 $ cd .. |
67 $ cd .. |