D5241: tests: fix a couple typos in test-resolve.t comments and add a comment
spectral (Kyle Lippincott)
phabricator at mercurial-scm.org
Thu Nov 8 06:54:05 EST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8785d66edd6e: tests: fix a couple typos in test-resolve.t comments and add a comment (authored by spectral, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5241?vs=12474&id=12478
REVISION DETAIL
https://phab.mercurial-scm.org/D5241
AFFECTED FILES
tests/test-resolve.t
CHANGE DETAILS
diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -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 ..
To: spectral, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list