Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: fix typo in help text stable
authorJens Bäckman <jens.backman@gmail.com>
Sat, 09 Jan 2010 23:03:33 +0100
branchstable
changeset 10224 712dc3b6db68
parent 10220 500d09be7ace
child 10225 6521605bc200
commands: fix typo in help text
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Fri Jan 08 23:15:24 2010 +0100
+++ b/mercurial/commands.py	Sat Jan 09 23:03:33 2010 +0100
@@ -2460,7 +2460,7 @@
     will be overwritten if the merge is retried with resolve. The
     -m/--mark switch should be used to mark the file as resolved.
 
-    You can specify a set of files to operate on, or use the -a/-all
+    You can specify a set of files to operate on, or use the -a/--all
     switch to select all unresolved files.
 
     This command also allows listing resolved files and manually
hg-stable