diff mercurial/configitems.py @ 47859:155a2ec8a9dc

merge with stable
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 22 Aug 2021 16:32:06 -0400
parents de2e04fe4897 2813d406b036
children 62f325f9b347
line wrap: on
line diff
--- a/mercurial/configitems.py	Tue Jul 20 17:20:19 2021 +0200
+++ b/mercurial/configitems.py	Sun Aug 22 16:32:06 2021 -0400
@@ -1897,6 +1897,11 @@
     default=True,
     alias=[(b'format', b'aggressivemergedeltas')],
 )
+coreconfigitem(
+    b'storage',
+    b'revlog.issue6528.fix-incoming',
+    default=True,
+)
 # experimental as long as rust is experimental (or a C version is implemented)
 coreconfigitem(
     b'storage',