# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1158535730 18000
# Node ID f96c8e219865cb8ce9a2e691be59d250f4163c9d
# Parent  5cc62d99b78520f7096c92201ec664e26138ee0b
merge: remove no longer possible clause

diff -r 5cc62d99b785 -r f96c8e219865 mercurial/merge.py
--- a/mercurial/merge.py	Sun Sep 17 17:39:19 2006 -0500
+++ b/mercurial/merge.py	Sun Sep 17 18:28:50 2006 -0500
@@ -133,10 +133,6 @@
                     ui.debug(_(" remote %s is newer, get\n") % f)
                     action.append((f, "g", m2.execf(f), m2[f]))
                     queued = 1
-            elif n[20:] in ("u","a"):
-                # this unknown file is the same as the checkout
-                # we need to reset the dirstate if the file was added
-                action.append((f, "g", m2.execf(f), m2[f]))
 
             # do we still need to look at mode bits?
             if not queued and m1.execf(f) != m2.execf(f):