60 [1] |
60 [1] |
61 |
61 |
62 $ hg co 0 |
62 $ hg co 0 |
63 merging zzz1_merge_ok |
63 merging zzz1_merge_ok |
64 merging zzz2_merge_bad |
64 merging zzz2_merge_bad |
65 warning: conflicts during merge. |
65 warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') |
66 merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
67 2 files updated, 1 files merged, 3 files removed, 1 files unresolved |
66 2 files updated, 1 files merged, 3 files removed, 1 files unresolved |
68 use 'hg resolve' to retry unresolved file merges |
67 use 'hg resolve' to retry unresolved file merges |
69 [1] |
68 [1] |
70 |
69 |
71 $ hg diff --nodates | grep "^[+-][^<>]" |
70 $ hg diff --nodates | grep "^[+-][^<>]" |
85 Local merge with conflicts: |
84 Local merge with conflicts: |
86 |
85 |
87 $ hg co |
86 $ hg co |
88 merging zzz1_merge_ok |
87 merging zzz1_merge_ok |
89 merging zzz2_merge_bad |
88 merging zzz2_merge_bad |
90 warning: conflicts during merge. |
89 warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') |
91 merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
92 3 files updated, 1 files merged, 2 files removed, 1 files unresolved |
90 3 files updated, 1 files merged, 2 files removed, 1 files unresolved |
93 use 'hg resolve' to retry unresolved file merges |
91 use 'hg resolve' to retry unresolved file merges |
94 [1] |
92 [1] |
95 |
93 |
96 $ hg co 0 |
94 $ hg co 0 |
97 merging zzz1_merge_ok |
95 merging zzz1_merge_ok |
98 merging zzz2_merge_bad |
96 merging zzz2_merge_bad |
99 warning: conflicts during merge. |
97 warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') |
100 merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
101 2 files updated, 1 files merged, 3 files removed, 1 files unresolved |
98 2 files updated, 1 files merged, 3 files removed, 1 files unresolved |
102 use 'hg resolve' to retry unresolved file merges |
99 use 'hg resolve' to retry unresolved file merges |
103 [1] |
100 [1] |
104 |
101 |
105 $ hg diff --nodates | grep "^[+-][^<>]" |
102 $ hg diff --nodates | grep "^[+-][^<>]" |