hgext/histedit.py

--- a/hgext/histedit.py	Sun Mar 25 11:58:05 2018 +0900
+++ b/hgext/histedit.py	Mon Mar 05 00:30:00 2018 -0500
@@ -499,7 +499,7 @@
         hg.update(repo, self.state.parentctxnode, quietempty=True)
         stats = applychanges(repo.ui, repo, rulectx, {})
         repo.dirstate.setbranch(rulectx.branch())
-        if stats and stats[3] > 0:
+        if stats.unresolvedcount:
             buf = repo.ui.popbuffer()
             repo.ui.write(buf)
             raise error.InterventionRequired(