# HG changeset patch
# User Arne Babenhauserheide <bab@draketo.de>
# Date 1302025724 -7200
# Node ID 1bd9f3a6a0d00cdcfc751b470456d25fb14d240b
# Parent  31eb145b50b675dfb210d693681aba82efd47be1
merge: added info that hg help merge-tools shows the options for --tool

diff -r 31eb145b50b6 -r 1bd9f3a6a0d0 mercurial/commands.py
--- 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