--- a/mercurial/merge.py Mon Aug 21 14:25:56 2006 -0500
+++ b/mercurial/merge.py Tue Aug 22 16:12:54 2006 -0500
@@ -181,7 +181,7 @@
elif f in ma:
if n != ma[f]:
r = _("d")
- if not overwrite and (linear_path or branchmerge):
+ if not overwrite:
r = repo.ui.prompt(
(_(" local changed %s which remote deleted\n") % f) +
_("(k)eep or (d)elete?"), _("[kd]"), _("k"))
@@ -211,7 +211,7 @@
continue
if f in ma and n != ma[f]:
r = _("k")
- if not overwrite and (linear_path or branchmerge):
+ if not overwrite:
r = repo.ui.prompt(
(_("remote changed %s which local deleted\n") % f) +
_("(k)eep or (d)elete?"), _("[kd]"), _("k"))