##// END OF EJS Templates
tests: fix a couple typos in test-resolve.t comments and add a comment...
Kyle Lippincott -
r40600:8785d66e default
parent child Browse files
Show More
@@ -435,7 +435,7 b' If the user passes an invalid value, we '
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
@@ -583,7 +583,7 b' Test that commands.resolve.confirm respe'
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
@@ -613,4 +613,6 b' Test that commands.resolve.confirm respe'
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 ..
General Comments 0
You need to be logged in to leave comments. Login now