diff -r 067540702f64 -r be83fd9d46d5 mercurial/help.py --- a/mercurial/help.py Mon Feb 09 14:59:04 2015 -0800 +++ b/mercurial/help.py Mon Feb 09 23:07:39 2015 -0800 @@ -204,7 +204,8 @@ addtopichook(topic, add) addtopicsymbols('filesets', '.. predicatesmarker', fileset.symbols) -addtopicsymbols('merge-tools', '.. internaltoolsmarker', filemerge.internals) +addtopicsymbols('merge-tools', '.. internaltoolsmarker', + filemerge.internalsdoc) addtopicsymbols('revsets', '.. predicatesmarker', revset.symbols) addtopicsymbols('templates', '.. keywordsmarker', templatekw.dockeywords) addtopicsymbols('templates', '.. filtersmarker', templatefilters.filters)