--- a/mercurial/commands.py Tue Nov 17 15:51:09 2020 -0800
+++ b/mercurial/commands.py Thu Oct 22 14:14:59 2020 -0700
@@ -5830,7 +5830,7 @@
if ui.promptchoice(
_(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
):
- raise error.Abort(_(b'user quit'))
+ raise error.CanceledError(_(b'user quit'))
if mark and not pats:
if ui.promptchoice(
_(
@@ -5838,7 +5838,7 @@
b'$$ &Yes $$ &No'
)
):
- raise error.Abort(_(b'user quit'))
+ raise error.CanceledError(_(b'user quit'))
if unmark and not pats:
if ui.promptchoice(
_(
@@ -5846,7 +5846,7 @@
b'$$ &Yes $$ &No'
)
):
- raise error.Abort(_(b'user quit'))
+ raise error.CanceledError(_(b'user quit'))
uipathfn = scmutil.getuipathfn(repo)