Show More
@@ -1195,7 +1195,11 b' def _onfilemergefailure(ui):' | |||||
1195 |
|
1195 | |||
1196 | def hasconflictmarkers(data): |
|
1196 | def hasconflictmarkers(data): | |
1197 | return bool( |
|
1197 | return bool( | |
1198 | re.search(b"^(<<<<<<< .*|=======|>>>>>>> .*)$", data, re.MULTILINE) |
|
1198 | re.search( | |
|
1199 | br"^(<<<<<<<.*|=======.*|------- .*|\+\+\+\+\+\+\+ .*|>>>>>>>.*)$", | |||
|
1200 | data, | |||
|
1201 | re.MULTILINE, | |||
|
1202 | ) | |||
1199 | ) |
|
1203 | ) | |
1200 |
|
1204 | |||
1201 |
|
1205 |
@@ -344,6 +344,24 b' Try with --all from the hint' | |||||
344 | $ hg resolve -l |
|
344 | $ hg resolve -l | |
345 | R file1 |
|
345 | R file1 | |
346 | R file2 |
|
346 | R file2 | |
|
347 | Test with :mergediff conflict markers | |||
|
348 | $ hg resolve --unmark | |||
|
349 | $ hg resolve --re-merge -t :mergediff file2 | |||
|
350 | merging file2 | |||
|
351 | warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') | |||
|
352 | [1] | |||
|
353 | $ hg resolve -l | |||
|
354 | U file1 | |||
|
355 | U file2 | |||
|
356 | $ hg --config commands.resolve.mark-check=abort resolve -m | |||
|
357 | warning: the following files still have conflict markers: | |||
|
358 | file2 | |||
|
359 | abort: conflict markers detected | |||
|
360 | (use --all to mark anyway) | |||
|
361 | [20] | |||
|
362 | $ hg resolve -l | |||
|
363 | U file1 | |||
|
364 | U file2 | |||
347 | Test option value 'warn' |
|
365 | Test option value 'warn' | |
348 | $ hg resolve --unmark |
|
366 | $ hg resolve --unmark | |
349 | $ hg resolve -l |
|
367 | $ hg resolve -l |
General Comments 0
You need to be logged in to leave comments.
Login now