Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 16009:f1208827df7c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: mention merge-tools topic in help
author Augie Fackler <durin42@gmail.com>
date Fri, 27 Jan 2012 14:19:32 -0600
parents 0b05e0bfdc1c
children c7811ca6fb94
comparison
equal deleted inserted replaced
16008:02a497a17257 16009:f1208827df7c
4601 Merges with unresolved conflicts are often the result of 4601 Merges with unresolved conflicts are often the result of
4602 non-interactive merging using the ``internal:merge`` configuration 4602 non-interactive merging using the ``internal:merge`` configuration
4603 setting, or a command-line merge tool like ``diff3``. The resolve 4603 setting, or a command-line merge tool like ``diff3``. The resolve
4604 command is used to manage the files involved in a merge, after 4604 command is used to manage the files involved in a merge, after
4605 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the 4605 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4606 working directory must have two parents). 4606 working directory must have two parents). See :hg:`help
4607 merge-tools` for information on configuring merge tools.
4607 4608
4608 The resolve command can be used in the following ways: 4609 The resolve command can be used in the following ways:
4609 4610
4610 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified 4611 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4611 files, discarding any previous merge attempts. Re-merging is not 4612 files, discarding any previous merge attempts. Re-merging is not