changeset 1358:d28bfd2c6e32

Merge with stable.
author Augie Fackler <raf@durin42.com>
date Wed, 30 Sep 2015 11:03:46 -0400
parents 57d65269d30c (current diff) 44895e2abff2 (diff)
children 72d5a2449bf5
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/__init__.py
+++ b/hgsubversion/__init__.py
@@ -159,7 +159,8 @@ def extsetup(ui):
     entries = (
         (['subversion'],
          "Working with Subversion Repositories",
-         lambda: open(os.path.join(helpdir, 'subversion.rst')).read()),
+         # Mercurial >= 3.6: doc(ui)
+         lambda *args: open(os.path.join(helpdir, 'subversion.rst')).read()),
     )
 
     help.helptable.extend(entries)