# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1158540841 18000
# Node ID c4e26f1ccfcc398efb3128cd094dd8246aaf179c
# Parent  d1d1cd5b9484ccb7ce87096926673c1bcebd2e28
merge: eliminate redundant security check

duplicated in applyupdates

diff -r d1d1cd5b9484 -r c4e26f1ccfcc mercurial/merge.py
--- a/mercurial/merge.py	Sun Sep 17 19:53:19 2006 -0500
+++ b/mercurial/merge.py	Sun Sep 17 19:54:01 2006 -0500
@@ -174,8 +174,6 @@
                 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: