Mercurial > hg

diff mercurial/commands.py @ 10226:e3e41e5e7ff4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Martin Geisler <mg@lazybytes.net>
date Sat, 09 Jan 2010 23:16:48 +0100
parents 3ab391dd5ec5 712dc3b6db68
children d6512b3e9ac0
line wrap: on
line diff
--- a/mercurial/commands.py	Sat Jan 09 10:47:47 2010 +0100
+++ b/mercurial/commands.py	Sat Jan 09 23:16:48 2010 +0100
@@ -2443,7 +2443,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