Mercurial > hg-stable
changeset 40614: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 | b9557567cc3f |
| children | b93157f69f46 |
| files | tests/test-resolve.t |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-resolve.t Tue Nov 06 15:50:41 2018 -0800 +++ b/tests/test-resolve.t Wed Nov 07 15:41:18 2018 -0800 @@ -435,7 +435,7 @@ $ hg resolve -l R file1 R file2 -Test explicitly setting the otion to 'none' +Test explicitly setting the option to 'none' $ hg resolve --unmark $ hg resolve -l U file1 @@ -583,7 +583,7 @@ R emp3 Test that commands.resolve.confirm respect --unmark option (only when no patterns args are given): -=============================================================================================== +================================================================================================= $ hg resolve -u emp1 @@ -613,4 +613,6 @@ $ hg rebase --abort rebase aborted + +Done with commands.resolve.confirm tests: $ cd ..