--- a/mercurial/configitems.py Wed Sep 23 14:20:49 2020 -0400
+++ b/mercurial/configitems.py Mon Sep 14 14:31:23 2020 +0530
@@ -590,6 +590,11 @@
coreconfigitem(
b'experimental', b'maxdeltachainspan', default=-1,
)
+# tracks files which were undeleted (merge might delete them but we explicitly
+# kept/undeleted them) and creates new filenodes for them
+coreconfigitem(
+ b'experimental', b'merge-track-salvaged', default=False,
+)
coreconfigitem(
b'experimental', b'mergetempdirprefix', default=None,
)