Mercurial Mercurial > public > mercurial-scm > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
branchstable
changeset 12809 e5922564ab01
parent 12803 a6a0698960cc
child 12810 a68ccfd9c7be 
--- a/mercurial/commands.py	Fri Oct 22 17:05:51 2010 +0200
+++ b/mercurial/commands.py	Fri Oct 22 17:08:15 2010 +0200
@@ -2943,7 +2943,7 @@
 
     The resolve command can be used in the following ways:
 
-    - :hg:`resolve [--tool] FILE...`: attempt to re-merge the specified
+    - :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
mercurial-scm/hg