Show More
@@ -435,7 +435,7 b' If the user passes an invalid value, we ' | |||
|
435 | 435 | $ hg resolve -l |
|
436 | 436 | R file1 |
|
437 | 437 | R file2 |
|
438 | Test explicitly setting the otion to 'none' | |
|
438 | Test explicitly setting the option to 'none' | |
|
439 | 439 | $ hg resolve --unmark |
|
440 | 440 | $ hg resolve -l |
|
441 | 441 | U file1 |
@@ -583,7 +583,7 b' Test that commands.resolve.confirm respe' | |||
|
583 | 583 | R emp3 |
|
584 | 584 | |
|
585 | 585 | Test that commands.resolve.confirm respect --unmark option (only when no patterns args are given): |
|
586 | =============================================================================================== | |
|
586 | ================================================================================================= | |
|
587 | 587 | |
|
588 | 588 | $ hg resolve -u emp1 |
|
589 | 589 | |
@@ -613,4 +613,6 b' Test that commands.resolve.confirm respe' | |||
|
613 | 613 | |
|
614 | 614 | $ hg rebase --abort |
|
615 | 615 | rebase aborted |
|
616 | ||
|
617 | Done with commands.resolve.confirm tests: | |
|
616 | 618 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now