Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 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 a934b9249574
children 0bb0f807dfc3 39eb2e86fb11
comparison
equal deleted inserted replaced
15040:a494b54b6ed3 15042:5e7f03cfeeb9
4066 The resolve command can be used in the following ways: 4066 The resolve command can be used in the following ways:
4067 4067
4068 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified 4068 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4069 files, discarding any previous merge attempts. Re-merging is not 4069 files, discarding any previous merge attempts. Re-merging is not
4070 performed for files already marked as resolved. Use ``--all/-a`` 4070 performed for files already marked as resolved. Use ``--all/-a``
4071 to selects all unresolved files. ``--tool`` can be used to specify 4071 to select all unresolved files. ``--tool`` can be used to specify
4072 the merge tool used for the given files. It overrides the HGMERGE 4072 the merge tool used for the given files. It overrides the HGMERGE
4073 environment variable and your configuration files. 4073 environment variable and your configuration files.
4074 4074
4075 - :hg:`resolve -m [FILE]`: mark a file as having been resolved 4075 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4076 (e.g. after having manually fixed-up the files). The default is 4076 (e.g. after having manually fixed-up the files). The default is