132 (use --all to re-merge all unresolved files) |
132 (use --all to re-merge all unresolved files) |
133 [255] |
133 [255] |
134 |
134 |
135 resolve --all should re-merge all unresolved files |
135 resolve --all should re-merge all unresolved files |
136 $ hg resolve -q --all |
136 $ hg resolve -q --all |
137 warning: conflicts during merge. |
137 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') |
138 merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark') |
138 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') |
139 warning: conflicts during merge. |
|
140 merging file2 incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
141 [1] |
139 [1] |
142 $ grep '<<<' file1 > /dev/null |
140 $ grep '<<<' file1 > /dev/null |
143 $ grep '<<<' file2 > /dev/null |
141 $ grep '<<<' file2 > /dev/null |
144 |
142 |
145 resolve <file> should re-merge file |
143 resolve <file> should re-merge file |
146 $ echo resolved > file1 |
144 $ echo resolved > file1 |
147 $ hg resolve -q file1 |
145 $ hg resolve -q file1 |
148 warning: conflicts during merge. |
146 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') |
149 merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
150 [1] |
147 [1] |
151 $ grep '<<<' file1 > /dev/null |
148 $ grep '<<<' file1 > /dev/null |
152 |
149 |
153 resolve <file> should do nothing if 'file' was marked resolved |
150 resolve <file> should do nothing if 'file' was marked resolved |
154 $ echo resolved > file1 |
151 $ echo resolved > file1 |