--- a/mercurial/merge.py	Sun Mar 12 11:43:31 2017 -0700
+++ b/mercurial/merge.py	Mon Mar 13 21:58:43 2017 -0700
@@ -1600,7 +1600,7 @@
 
         if updatecheck == 'noconflict':
             for f, (m, args, msg) in actionbyfile.iteritems():
-                if m not in ('g', 'k', 'r'):
+                if m not in ('g', 'k', 'e', 'r'):
                     msg = _("conflicting changes")
                     hint = _("commit or update --clean to discard changes")
                     raise error.Abort(msg, hint=hint)