# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1156281174 18000
# Node ID fa9c769fee8a043c39514c94576a4e6a2f3ec08f
# Parent  833677bc9791d193a92f3f1542feef617cf18f6d
merge: minor simplification

diff -r 833677bc9791 -r fa9c769fee8a mercurial/merge.py
--- 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"))