--- a/mercurial/configitems.py	Tue Jul 03 12:22:37 2018 -0400
+++ b/mercurial/configitems.py	Wed Jun 27 10:47:14 2018 -0400
@@ -560,6 +560,9 @@
 coreconfigitem('experimental', 'mergedriver',
     default=None,
 )
+coreconfigitem('experimental', 'nointerrupt', default=False)
+coreconfigitem('experimental', 'nointerrupt-interactiveonly', default=True)
+
 coreconfigitem('experimental', 'obsmarkers-exchange-debug',
     default=False,
 )