--- a/mercurial/ui.py	Sat Jun 17 18:28:20 2017 +0200
+++ b/mercurial/ui.py	Sat Jun 17 12:51:37 2017 +0200
@@ -460,7 +460,7 @@
                                "%s.%s = %s\n" % (section, n, uvalue))
         return value
 
-    def configsuboptions(self, section, name, default=None, untrusted=False):
+    def configsuboptions(self, section, name, default=_unset, untrusted=False):
         """Get a config option and all sub-options.
 
         Some config options have sub-options that are declared with the