changeset 13891 | 1bd9f3a6a0d0 |
parent 13878 | a8d13ee0ce68 |
child 13893 | 1aea86673dee |
--- a/mercurial/commands.py Tue Apr 05 11:55:52 2011 +0200 +++ b/mercurial/commands.py Tue Apr 05 19:48:44 2011 +0200 @@ -2809,7 +2809,7 @@ ``--tool`` can be used to specify the merge tool used for file merges. It overrides the HGMERGE environment variable and your - configuration files. + configuration files. See :hg:`help merge-tools` for options. If no revision is specified, the working directory's parent is a head revision, and the current branch contains exactly one other