# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1244502884 18000
# Node ID 8fd6f6b8b37d4beb09fd558c6fbc83543d307127
# Parent  6b675c781c6d4ba4d43cdffcbc509aff11f02462
merge: drop 'remote deleted' case

diff -r 6b675c781c6d -r 8fd6f6b8b37d mercurial/merge.py
--- a/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
+++ b/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
@@ -226,10 +226,6 @@
                     act("prompt keep", "a", f)
             elif n[20:] != "u":
                 act("other deleted", "r", f)
-        else:
-            # file is created on branch or in working directory
-            if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
-                act("remote deleted", "r", f)
 
     for f, n in m2.iteritems():
         if partial and not partial(f):