Submitter | phabricator |
---|---|
Date | Feb. 18, 2018, 4:26 p.m. |
Message ID | <01caabe4d0a424d59fe8d5bdea392e5b@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/28111/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/mercurial/manifest.py b/mercurial/manifest.py --- a/mercurial/manifest.py +++ b/mercurial/manifest.py @@ -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))