Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: added info that hg help merge-tools shows the options for --tool
authorArne Babenhauserheide <bab@draketo.de>
Tue, 05 Apr 2011 19:48:44 +0200
changeset 13891 1bd9f3a6a0d0
parent 13890 31eb145b50b6
child 13892 31d15f761631
merge: added info that hg help merge-tools shows the options for --tool
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial