changeset 45681 | a736ab681b78 |
parent 45552 | 10284ce3d5ed |
child 45784 | 74271829ddc0 |
--- a/mercurial/exchange.py Tue Oct 06 21:06:18 2020 -0700 +++ b/mercurial/exchange.py Thu Oct 08 15:35:44 2020 -0700 @@ -1720,7 +1720,7 @@ repo = reporef() cm = _(b'accept incoming changes (yn)?$$ &Yes $$ &No') if repo.ui.promptchoice(cm): - raise error.Abort("user aborted") + raise error.Abort(b"user aborted") tr.addvalidator(b'900-pull-prompt', prompt)