Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 12809:e5922564ab01 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: improve merge-tools topic, describe --tool and clarify details This doesn't make it simpler, but it makes it more correct. With help from erikz, mg and abuehl.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 22 Oct 2010 17:08:15 +0200
parents a6a0698960cc
children a68ccfd9c7be
line wrap: on
line diff
--- 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