Mercurial > hg

changeset 15042:5e7f03cfeeb9 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: fix grammar in resolve help text
author Pang Yan Han <pangyanhan@gmail.com>
date Wed, 17 Aug 2011 16:41:14 +0800
parents a494b54b6ed3
children 0bb0f807dfc3 39eb2e86fb11
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.