##// END OF EJS Templates
commands: fix grammar in resolve help text
Pang Yan Han -
r15042:5e7f03cf stable
parent child Browse files
Show More
@@ -4068,7 +4068,7 b' def resolve(ui, repo, *pats, **opts):'
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
General Comments 0
You need to be logged in to leave comments. Login now