changeset 3674 | 9103dab96093 |
parent 3673 | eb0b4a2d70a9 |
child 3710 | 91690473856c |
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -139,6 +139,8 @@ def findcopies(repo, m1, m2, ma, limit): ''' check if an apparent pair actually matches ''' c2 = ctx(f2, man[f2]) ca = c.ancestor(c2) + if c == ca or c2 == ca: + return if ca and ca.path() == c.path() or ca.path() == c2.path(): copy[c.path()] = f2 copy[f2] = c.path()