Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/manifest.py
changeset 36300 413c179cf7d5
parent 36174 b42c47b8c9d4
child 36301 5245bac09e6a 
--- a/mercurial/manifest.py	Sun Feb 18 00:43:50 2018 -0500
+++ b/mercurial/manifest.py	Sun Feb 18 00:49:11 2018 -0500
@@ -960,7 +960,7 @@
                 else:
                     files.update(m1.iterkeys())
 
-            for fn in t1._files.iterkeys():
+            for fn in t1._files:
                 if fn not in t2._files:
                     files.add(t1._subpath(fn))
mercurial