mercurial/configitems.py
changeset 48981 f3aafd785e65
parent 48946 642e31cb55f0
child 48982 9dfbea54b680
--- a/mercurial/configitems.py	Mon Mar 21 10:55:50 2022 +0100
+++ b/mercurial/configitems.py	Tue Jan 18 13:05:21 2022 -0800
@@ -1570,6 +1570,37 @@
     default=False,
 )
 coreconfigitem(
+    b'partial-merge-tools',
+    b'.*',
+    default=None,
+    generic=True,
+    experimental=True,
+)
+coreconfigitem(
+    b'partial-merge-tools',
+    br'.*\.patterns',
+    default=dynamicdefault,
+    generic=True,
+    priority=-1,
+    experimental=True,
+)
+coreconfigitem(
+    b'partial-merge-tools',
+    br'.*\.executable$',
+    default=dynamicdefault,
+    generic=True,
+    priority=-1,
+    experimental=True,
+)
+coreconfigitem(
+    b'partial-merge-tools',
+    br'.*\.order',
+    default=0,
+    generic=True,
+    priority=-1,
+    experimental=True,
+)
+coreconfigitem(
     b'merge-tools',
     b'.*',
     default=None,