mercurial/configitems.py

--- a/mercurial/configitems.py	Thu Dec 24 11:21:23 2020 -0500
+++ b/mercurial/configitems.py	Thu Feb 04 13:05:51 2021 -0800
@@ -754,6 +754,12 @@
 )
 _registerdiffopts(section=b'diff')
 coreconfigitem(
+    b'diff',
+    b'merge',
+    default=False,
+    experimental=True,
+)
+coreconfigitem(
     b'email',
     b'bcc',
     default=None,