equal
deleted
inserted
replaced
371 |
371 |
372 resolve -l should be empty |
372 resolve -l should be empty |
373 |
373 |
374 $ hg resolve -l |
374 $ hg resolve -l |
375 |
375 |
|
376 resolve -m can be configured to look for remaining conflict markers |
|
377 $ hg up -qC 2 |
|
378 $ hg merge -q --tool=internal:merge 1 |
|
379 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') |
|
380 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') |
|
381 [1] |
|
382 $ hg resolve -l |
|
383 U file1 |
|
384 U file2 |
|
385 $ echo 'remove markers' > file1 |
|
386 $ hg --config experimental.resolve.mark-check=abort resolve -m |
|
387 warning: the following files still have conflict markers: |
|
388 file2 |
|
389 abort: conflict markers detected |
|
390 (use --all to mark anyway) |
|
391 [255] |
|
392 $ hg resolve -l |
|
393 U file1 |
|
394 U file2 |
|
395 Try with --all from the hint |
|
396 $ hg --config experimental.resolve.mark-check=abort resolve -m --all |
|
397 warning: the following files still have conflict markers: |
|
398 file2 |
|
399 (no more unresolved files) |
|
400 $ hg resolve -l |
|
401 R file1 |
|
402 R file2 |
|
403 $ hg resolve --unmark |
|
404 $ hg resolve -l |
|
405 U file1 |
|
406 U file2 |
|
407 $ hg --config experimental.resolve.mark-check=warn resolve -m |
|
408 warning: the following files still have conflict markers: |
|
409 file2 |
|
410 (no more unresolved files) |
|
411 $ hg resolve -l |
|
412 R file1 |
|
413 R file2 |
|
414 If the file is already marked as resolved, we don't warn about it |
|
415 $ hg resolve --unmark file1 |
|
416 $ hg resolve -l |
|
417 U file1 |
|
418 R file2 |
|
419 $ hg --config experimental.resolve.mark-check=warn resolve -m |
|
420 (no more unresolved files) |
|
421 $ hg resolve -l |
|
422 R file1 |
|
423 R file2 |
|
424 |
376 $ cd .. |
425 $ cd .. |