Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: eliminate redundant security check
authorMatt Mackall <mpm@selenic.com>
Sun, 17 Sep 2006 19:54:01 -0500
changeset 3114 c4e26f1ccfcc
parent 3113 d1d1cd5b9484
child 3115 bb74f809bc95
merge: eliminate redundant security check duplicated in applyupdates
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- 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:
Mercurial