Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 3114:c4e26f1ccfcc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: eliminate redundant security check duplicated in applyupdates
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 19:54:01 -0500
parents d1d1cd5b9484
children bb74f809bc95
line wrap: on
line diff
--- 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: