--- a/hgext/histedit.py Thu Jan 10 21:57:21 2019 +0900
+++ b/hgext/histedit.py Wed Jan 09 18:00:20 2019 -0500
@@ -1593,7 +1593,10 @@
for intentional "edit" command, but also for resolving unexpected
conflicts).
"""
- if ui.interface('histedit') == 'curses':
+ # kludge: _chistedit only works for starting an edit, not aborting
+ # or continuing, so fall back to regular _texthistedit for those
+ # operations.
+ if ui.interface('histedit') == 'curses' and _getgoal(opts) == goalnew:
return _chistedit(ui, repo, *freeargs, **opts)
return _texthistedit(ui, repo, *freeargs, **opts)