--- a/mercurial/localrepo.py Thu Jul 19 09:57:42 2018 +0200
+++ b/mercurial/localrepo.py Thu Jul 19 10:06:58 2018 +0200
@@ -669,9 +669,9 @@
if manifestcachesize is not None:
self.svfs.options['manifestcachesize'] = manifestcachesize
# experimental config: format.aggressivemergedeltas
- aggressivemergedeltas = self.ui.configbool('format',
- 'aggressivemergedeltas')
- self.svfs.options['aggressivemergedeltas'] = aggressivemergedeltas
+ deltabothparents = self.ui.configbool('format',
+ 'aggressivemergedeltas')
+ self.svfs.options['deltabothparents'] = deltabothparents
self.svfs.options['lazydeltabase'] = not scmutil.gddeltaconfig(self.ui)
chainspan = self.ui.configbytes('experimental', 'maxdeltachainspan')
if 0 <= chainspan: