--- a/mercurial/commands.py Mon Aug 08 14:32:27 2011 +0900
+++ b/mercurial/commands.py Wed Aug 17 16:41:14 2011 +0800
@@ -4068,7 +4068,7 @@
- :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
files, discarding any previous merge attempts. Re-merging is not
performed for files already marked as resolved. Use ``--all/-a``
- to selects all unresolved files. ``--tool`` can be used to specify
+ to select all unresolved files. ``--tool`` can be used to specify
the merge tool used for the given files. It overrides the HGMERGE
environment variable and your configuration files.