merge: simplify tests for local changed/remote deleted

mercurial/merge.py

@@ -148,9 +148,7 b' def manifestmerge(ui, m1, m2, ma, overwr'
                         action.append((f, "e", m2.execf(f)))
             del m2[f]
         elif f in ma:
-            if n != ma[f]:
-                r = _("d")
-                if not overwrite:
+            if n != ma[f] and not overwrite:
                     r = ui.prompt(
                         (_(" local changed %s which remote deleted\n") % f) +
                          _("(k)eep or (d)elete?"), _("[kd]"), _("k"))