Mercurial > hg
changeset 16009:f1208827df7c stable
resolve: mention merge-tools topic in help
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Fri, 27 Jan 2012 14:19:32 -0600 |
| parents | 02a497a17257 |
| children | c7811ca6fb94 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Jan 27 22:29:58 2012 +0900 +++ b/mercurial/commands.py Fri Jan 27 14:19:32 2012 -0600 @@ -4603,7 +4603,8 @@ setting, or a command-line merge tool like ``diff3``. The resolve command is used to manage the files involved in a merge, after :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the - working directory must have two parents). + working directory must have two parents). See :hg:`help + merge-tools` for information on configuring merge tools. The resolve command can be used in the following ways: