diff -r 8891dc15b327 -r 93777d16a25d mercurial/filelog.py
--- a/mercurial/filelog.py	Thu Jul 19 09:57:42 2018 +0200
+++ b/mercurial/filelog.py	Thu Jul 19 10:06:58 2018 +0200
@@ -215,12 +215,12 @@
         self._revlog._lazydeltabase = value
 
     @property
-    def _aggressivemergedeltas(self):
-        return self._revlog._aggressivemergedeltas
+    def _deltabothparents(self):
+        return self._revlog._deltabothparents
 
-    @_aggressivemergedeltas.setter
-    def _aggressivemergedeltas(self, value):
-        self._revlog._aggressivemergedeltas = value
+    @_deltabothparents.setter
+    def _deltabothparents(self, value):
+        self._revlog._deltabothparents = value
 
     @property
     def _inline(self):