Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-resolve.t
changeset 40567 8785d66edd6e
parent 39928 f07ab9ddc0c0
child 40568 b93157f69f46 
--- 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 ..
Mercurial