Mercurial Mercurial > public > mercurial-scm > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/cmdutil.py
changeset 40346 943248e47864
parent 40295 fa88170c10bb
child 40366 b14fdf1fb615 
--- a/mercurial/cmdutil.py	Sun Oct 14 11:16:22 2018 -0400
+++ b/mercurial/cmdutil.py	Wed Oct 17 21:00:36 2018 +0800
@@ -149,7 +149,7 @@
 ]
 
 mergetoolopts = [
-    ('t', 'tool', '', _('specify merge tool')),
+    ('t', 'tool', '', _('specify merge tool'), _('TOOL')),
 ]
 
 similarityopts = [
mercurial-scm/hg