[PATCH] merge: added info that hg help merge-tools shows the options for --tool

[arne_bab at web.de]

# HG changeset patch
# User Arne Babenhauserheide <bab at draketo.de>
# Date 1302025724 -7200
# Branch stable
# Node ID d02d531e333694c2e819fc5c11015958218a0fee
# Parent  e33ebe67657a481fd0c0f53ea929aa41925fd972
merge: added info that hg help merge-tools shows the options for --tool

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2711,7 +2711,7 @@ def merge(ui, repo, node=None, **opts):
 
     ``--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