merge: eliminate redundant security check
authorMatt Mackall <mpm@selenic.com>
Sun, 17 Sep 2006 19:54:01 -0500
changeset 3115 c4e26f1ccfcc
parent 3114 d1d1cd5b9484
child 3116 bb74f809bc95
merge: eliminate redundant security check duplicated in applyupdates
mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -174,8 +174,6 @@ def manifestmerge(ui, m1, m2, ma, overwr
                 ui.debug(_("working dir created %s, keeping\n") % f)
 
     for f, n in m2.iteritems():
-        if f[0] == "/":
-            continue
         if f in ma and n != ma[f]:
             r = _("k")
             if not overwrite: