diff -r 3177d710630d -r 296b09dcef63 mercurial/merge.py
--- a/mercurial/merge.py	Thu Nov 13 23:12:15 2014 -0800
+++ b/mercurial/merge.py	Fri Nov 14 09:33:28 2014 -0800
@@ -514,11 +514,9 @@
             else:
                 # if different: old untracked f may be overwritten and lost
                 if acceptremote:
-                    actions['g'].append((f, (m2.flags(f),),
-                                   "remote recreating"))
+                    actions['g'].append((f, (fl2,), "remote recreating"))
                 else:
-                    actions['dc'].append((f, (m2.flags(f),),
-                                   "prompt deleted/changed"))
+                    actions['dc'].append((f, (fl2,), "prompt deleted/changed"))
 
     for f, m in sorted(aborts):
         if m == "ud":