--- a/mercurial/ui.py Tue Nov 17 15:51:09 2020 -0800
+++ b/mercurial/ui.py Thu Oct 22 14:14:59 2020 -0700
@@ -1852,7 +1852,7 @@
self.system(
b"%s \"%s\"" % (editor, name),
environ=environ,
- onerr=error.Abort,
+ onerr=error.CanceledError,
errprefix=_(b"edit failed"),
blockedtag=b'editor',
)