--- a/mercurial/configitems.py Wed May 04 18:17:44 2022 +0200
+++ b/mercurial/configitems.py Tue Apr 26 09:06:30 2022 -0700
@@ -1570,6 +1570,12 @@
default=False,
)
coreconfigitem(
+ b'merge',
+ b'disable-partial-tools',
+ default=False,
+ experimental=True,
+)
+coreconfigitem(
b'partial-merge-tools',
b'.*',
default=None,
@@ -1609,6 +1615,14 @@
experimental=True,
)
coreconfigitem(
+ b'partial-merge-tools',
+ br'.*\.disable',
+ default=False,
+ generic=True,
+ priority=-1,
+ experimental=True,
+)
+coreconfigitem(
b'merge-tools',
b'.*',
default=None,