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

merge: simplify a delete case

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -222,7 +222,7 @@ def manifestmerge(repo, p1, p2, pa, over
                     act("prompt keep", "a", f)
             else:
                 act("other deleted", "r", f)
-        elif overwrite and n[20:] == "a": # do not erase the working copy
+        elif n[20:] == "a": # only forget locally-added
             act("remote deleted", "f", f)
         else:
             # file is created on branch or in working directory