diff -r 0298a07f64d9 -r 1070df141718 mercurial/merge.py
--- a/mercurial/merge.py	Thu Nov 10 02:17:22 2016 -0800
+++ b/mercurial/merge.py	Thu Nov 10 02:19:16 2016 -0800
@@ -15,6 +15,7 @@
 
 from .i18n import _
 from .node import (
+    addednodeid,
     bin,
     hex,
     nullhex,
@@ -873,7 +874,7 @@
                     else:
                         actions[f] = ('cd', (f, None, f, False, pa.node()),
                                       "prompt changed/deleted")
-                elif n1[20:] == 'a':
+                elif n1 == addednodeid:
                     # This extra 'a' is added by working copy manifest to mark
                     # the file as locally added. We should forget it instead of
                     # deleting it.