--- a/tests/test-merge-force.t Sun Oct 11 20:12:12 2015 -0700
+++ b/tests/test-merge-force.t Sun Oct 11 21:56:39 2015 -0700
@@ -192,27 +192,27 @@
remote changed content1_content2_missing_missing-untracked which local deleted
use (c)hanged version or leave (d)eleted? c
merging content1_content2_content1_content4-tracked
- warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
merging content1_content2_content2_content1-tracked
merging content1_content2_content2_content4-tracked
- warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
merging content1_content2_content3_content1-tracked
merging content1_content2_content3_content3-tracked
- warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
merging content1_content2_content3_content4-tracked
- warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
merging content1_content2_missing_content1-tracked
merging content1_content2_missing_content4-tracked
+ merging missing_content2_content2_content4-tracked
+ merging missing_content2_content3_content3-tracked
+ merging missing_content2_content3_content4-tracked
+ merging missing_content2_missing_content4-tracked
+ merging missing_content2_missing_content4-untracked
+ warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
+ warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
+ warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
+ warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
- merging missing_content2_content2_content4-tracked
warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
- merging missing_content2_content3_content3-tracked
warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
- merging missing_content2_content3_content4-tracked
warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
- merging missing_content2_missing_content4-tracked
warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
- merging missing_content2_missing_content4-untracked
warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
39 files updated, 3 files merged, 8 files removed, 10 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon