# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1443625426 14400
# Node ID d28bfd2c6e32095787d7849310aef5f2b475fe9e
# Parent  57d65269d30cc002043152c48979c4acb39e8bce# Parent  44895e2abff2fddbc1eb5810a43ff63639093111
Merge with stable.

diff --git a/hgsubversion/__init__.py b/hgsubversion/__init__.py
--- 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)