# HG changeset patch
# User Pang Yan Han <pangyanhan@gmail.com>
# Date 1313570474 -28800
# Node ID 5e7f03cfeeb9b1db7d5b6192b19ad10626a39bfb
# Parent  a494b54b6ed354816ba445d28a6579bd12cbe2a8
commands: fix grammar in resolve help text

diff -r a494b54b6ed3 -r 5e7f03cfeeb9 mercurial/commands.py
--- 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.