# HG changeset patch # User Kyle Lippincott # Date 1541634078 28800 # Node ID 8785d66edd6e23842c0dbe5a0de29bb11af756c3 # Parent b9557567cc3fc007dd2b195c5e065dc51e30acae tests: fix a couple typos in test-resolve.t comments and add a comment Differential Revision: https://phab.mercurial-scm.org/D5241 diff -r b9557567cc3f -r 8785d66edd6e tests/test-resolve.t --- 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 ..