Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 10224:712dc3b6db68 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: fix typo in help text
author Jens B?ckman <jens.backman@gmail.com>
date Sat, 09 Jan 2010 23:03:33 +0100
parents 43f8abcec42d
children e3e41e5e7ff4 25e572394f5c
line wrap: on
line diff
--- 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