equal
deleted
inserted
replaced
398 file2 |
398 file2 |
399 (no more unresolved files) |
399 (no more unresolved files) |
400 $ hg resolve -l |
400 $ hg resolve -l |
401 R file1 |
401 R file1 |
402 R file2 |
402 R file2 |
|
403 Test option value 'warn' |
403 $ hg resolve --unmark |
404 $ hg resolve --unmark |
404 $ hg resolve -l |
405 $ hg resolve -l |
405 U file1 |
406 U file1 |
406 U file2 |
407 U file2 |
407 $ hg --config commands.resolve.mark-check=warn resolve -m |
408 $ hg --config commands.resolve.mark-check=warn resolve -m |
415 $ hg resolve --unmark file1 |
416 $ hg resolve --unmark file1 |
416 $ hg resolve -l |
417 $ hg resolve -l |
417 U file1 |
418 U file1 |
418 R file2 |
419 R file2 |
419 $ hg --config commands.resolve.mark-check=warn resolve -m |
420 $ hg --config commands.resolve.mark-check=warn resolve -m |
|
421 (no more unresolved files) |
|
422 $ hg resolve -l |
|
423 R file1 |
|
424 R file2 |
|
425 If the user passes an invalid value, we treat it as 'none'. |
|
426 $ hg resolve --unmark |
|
427 $ hg resolve -l |
|
428 U file1 |
|
429 U file2 |
|
430 $ hg --config commands.resolve.mark-check=nope resolve -m |
|
431 (no more unresolved files) |
|
432 $ hg resolve -l |
|
433 R file1 |
|
434 R file2 |
|
435 Test explicitly setting the otion to 'none' |
|
436 $ hg resolve --unmark |
|
437 $ hg resolve -l |
|
438 U file1 |
|
439 U file2 |
|
440 $ hg --config commands.resolve.mark-check=none resolve -m |
420 (no more unresolved files) |
441 (no more unresolved files) |
421 $ hg resolve -l |
442 $ hg resolve -l |
422 R file1 |
443 R file1 |
423 R file2 |
444 R file2 |
424 |
445 |