diff mercurial/configitems.py @ 40936:e06719b7544d

merge with stable
author Augie Fackler <augie@google.com>
date Thu, 13 Dec 2018 14:44:54 -0500
parents 3764330f76a6 4265bfb53dd3
children dcac24ec935b
line wrap: on
line diff
--- a/mercurial/configitems.py	Wed Dec 12 22:45:02 2018 +0900
+++ b/mercurial/configitems.py	Thu Dec 13 14:44:54 2018 -0500
@@ -1307,6 +1307,9 @@
 coreconfigitem('web', 'cache',
     default=True,
 )
+coreconfigitem('web', 'comparisoncontext',
+    default=5,
+)
 coreconfigitem('web', 'contact',
     default=None,
 )