--- a/mercurial/configitems.py	Tue Jul 17 23:34:55 2018 -0700
+++ b/mercurial/configitems.py	Tue Jul 31 19:11:17 2018 +0530
@@ -190,6 +190,9 @@
 coreconfigitem('commands', 'grep.all-files',
     default=False,
 )
+coreconfigitem('commands', 'resolve.confirm',
+    default=False,
+)
 coreconfigitem('commands', 'show.aliasprefix',
     default=list,
 )