214 warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
214 warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
215 warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
215 warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
216 warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
216 warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
217 warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark') |
217 warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark') |
218 18 files updated, 3 files merged, 8 files removed, 35 files unresolved |
218 18 files updated, 3 files merged, 8 files removed, 35 files unresolved |
219 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
219 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
220 |
220 |
221 Check which files need to be resolved (should correspond to the output above). |
221 Check which files need to be resolved (should correspond to the output above). |
222 This should be the files for which the base (1st filename segment), the remote |
222 This should be the files for which the base (1st filename segment), the remote |
223 (2nd segment) and the working copy (4th segment) are all different. |
223 (2nd segment) and the working copy (4th segment) are all different. |
224 |
224 |