--- a/mercurial/commands.py Tue Jul 17 23:34:55 2018 -0700
+++ b/mercurial/commands.py Tue Jul 31 19:11:17 2018 +0530
@@ -4529,10 +4529,16 @@
"""
opts = pycompat.byteskwargs(opts)
+ confirm = ui.configbool('commands', 'resolve.confirm')
flaglist = 'all mark unmark list no_status'.split()
all, mark, unmark, show, nostatus = \
[opts.get(o) for o in flaglist]
+ if all and confirm:
+ if ui.promptchoice(_(b're-merge all unresolved files (yn)?'
+ b'$$ &Yes $$ &No')):
+ raise error.Abort(_('user quit'))
+
if (show and (mark or unmark)) or (mark and unmark):
raise error.Abort(_("too many options specified"))
if pats and all: