diff -r 5d00e6061ba2 -r 56469d475341 mercurial/configitems.py
--- a/mercurial/configitems.py	Sun Aug 26 15:52:34 2018 -0400
+++ b/mercurial/configitems.py	Sun Aug 26 16:42:28 2018 -0400
@@ -193,6 +193,9 @@
 coreconfigitem('commands', 'resolve.confirm',
     default=False,
 )
+coreconfigitem('commands', 'resolve.explicit-re-merge',
+    default=False,
+)
 coreconfigitem('commands', 'resolve.mark-check',
     default='none',
 )