changeset 38859 | db03e5cefc82 |
parent 38857 | 96d0795bd0bd |
child 38873 | 7e75777e4a51 |
--- a/mercurial/commands.py Fri Aug 03 12:59:01 2018 -0700 +++ b/mercurial/commands.py Sat Aug 04 12:23:18 2018 +0530 @@ -4546,6 +4546,10 @@ if not (all or pats or show or mark or unmark): raise error.Abort(_('no files or directories specified'), hint=('use --all to re-merge all unresolved files')) + if mark and confirm and not pats: + if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?' + b'$$ &Yes $$ &No')): + raise error.Abort(_('user quit')) if show: ui.pager('resolve')