changeset 3881 | c0a12e6441a5 |
parent 3862 | 46abbed02b2d |
child 3885 | 1e0b94cfba0e |
child 4117 | c95060a5391a |
old mode 100755 new mode 100644 --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -109,10 +109,10 @@ def findcopies(repo, m1, m2, ma, limit): visit = [fctx] while visit: fc = visit.pop() + if fc.path() != orig and fc.path() not in old: + old[fc.path()] = 1 if fc.rev() < limit: continue - if fc.path() != orig and fc.path() not in old: - old[fc.path()] = 1 visit += fc.parents() old = old.keys()