Mercurial > public > mercurial-scm > hg-stable

comparison 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
comparison
equal deleted inserted replaced
12808:74f6531581e8 12809:e5922564ab01
2941 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the 2941 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
2942 working directory must have two parents). 2942 working directory must have two parents).
2943 2943
2944 The resolve command can be used in the following ways: 2944 The resolve command can be used in the following ways:
2945 2945
2946 - :hg:`resolve [--tool] FILE...`: attempt to re-merge the specified 2946 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
2947 files, discarding any previous merge attempts. Re-merging is not 2947 files, discarding any previous merge attempts. Re-merging is not
2948 performed for files already marked as resolved. Use ``--all/-a`` 2948 performed for files already marked as resolved. Use ``--all/-a``
2949 to selects all unresolved files. ``--tool`` can be used to specify 2949 to selects all unresolved files. ``--tool`` can be used to specify
2950 the merge tool used for the given files. It overrides the HGMERGE 2950 the merge tool used for the given files. It overrides the HGMERGE
2951 environment variable and your configuration files. 2951 environment variable and your configuration files.