Mercurial > hg > gitweb

changeset 3112:f96c8e219865

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove no longer possible clause
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 18:28:50 -0500
parents 5cc62d99b785
children d1d1cd5b9484
files mercurial/merge.py
diffstat 1 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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):