Mercurial > hg
comparison tests/test-resolve.t @ 40567:8785d66edd6e
tests: fix a couple typos in test-resolve.t comments and add a comment
Differential Revision: https://phab.mercurial-scm.org/D5241
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Wed, 07 Nov 2018 15:41:18 -0800 |
parents | f07ab9ddc0c0 |
children | b93157f69f46 |
comparison
equal
deleted
inserted
replaced
40566:b9557567cc3f | 40567:8785d66edd6e |
---|---|
433 $ hg --config commands.resolve.mark-check=nope resolve -m | 433 $ hg --config commands.resolve.mark-check=nope resolve -m |
434 (no more unresolved files) | 434 (no more unresolved files) |
435 $ hg resolve -l | 435 $ hg resolve -l |
436 R file1 | 436 R file1 |
437 R file2 | 437 R file2 |
438 Test explicitly setting the otion to 'none' | 438 Test explicitly setting the option to 'none' |
439 $ hg resolve --unmark | 439 $ hg resolve --unmark |
440 $ hg resolve -l | 440 $ hg resolve -l |
441 U file1 | 441 U file1 |
442 U file2 | 442 U file2 |
443 $ hg --config commands.resolve.mark-check=none resolve -m | 443 $ hg --config commands.resolve.mark-check=none resolve -m |
581 R emp1 | 581 R emp1 |
582 R emp2 | 582 R emp2 |
583 R emp3 | 583 R emp3 |
584 | 584 |
585 Test that commands.resolve.confirm respect --unmark option (only when no patterns args are given): | 585 Test that commands.resolve.confirm respect --unmark option (only when no patterns args are given): |
586 =============================================================================================== | 586 ================================================================================================= |
587 | 587 |
588 $ hg resolve -u emp1 | 588 $ hg resolve -u emp1 |
589 | 589 |
590 $ hg resolve -l | 590 $ hg resolve -l |
591 U emp1 | 591 U emp1 |
611 R emp2 | 611 R emp2 |
612 R emp3 | 612 R emp3 |
613 | 613 |
614 $ hg rebase --abort | 614 $ hg rebase --abort |
615 rebase aborted | 615 rebase aborted |
616 | |
617 Done with commands.resolve.confirm tests: | |
616 $ cd .. | 618 $ cd .. |