Merge with stable
authorMartin Geisler <mg@lazybytes.net>
Thu, 22 Jul 2010 22:23:54 +0200
changeset 11658 9dc1838d3b8b
parent 11656 83eb6b1465bf (current diff)
parent 11657 5ed6802e6bcb (diff)
child 11659 deecf1953e7b
Merge with stable
--- a/mercurial/help.py	Sat Jul 03 08:28:23 2010 +0200
+++ b/mercurial/help.py	Thu Jul 22 22:23:54 2010 +0200
@@ -82,7 +82,7 @@
         return gettext(open(path).read())
     return loader
 
-helptable = (
+helptable = [
     (["config"], _("Configuration Files"), loaddoc('config')),
     (["dates"], _("Date Formats"), loaddoc('dates')),
     (["patterns"], _("File Name Patterns"), loaddoc('patterns')),
@@ -100,4 +100,4 @@
     (["extensions"], _("Using additional features"), extshelp),
     (["hgweb"], _("Configuring hgweb"), loaddoc('hgweb')),
     (["glossary"], _("Glossary"), loaddoc('glossary')),
-)
+]