# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2009-06-08 23:14:44
# Node ID 226f1005133cb2a90ada0722a91d02e824afdafe
# Parent  8a9899a6327e5fcce535035bc49ed0ca7efbc73b

merge: drop an overwrite test

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -212,7 +212,7 @@ def manifestmerge(repo, p1, p2, pa, over
                 act("local moved to " + f2, "m",
                     f, f2, f, fmerge(f, f2, f2), False)
         elif f in ma and not n[20:]:
-            if n != ma[f] and not overwrite:
+            if n != ma[f]:
                 if repo.ui.prompt(
                     _(" local changed %s which remote deleted\n"
                       "use (c)hanged version or (d)elete?") % f,