diff -r 2e7f326883cc mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -96,7 +96,7 @@ def findcopies(repo, m1, m2, ma, limit): seen[s] = 1 if fc.path() != orig and fc.path() not in old: old[fc.path()] = 1 - if fc.rev() < limit: + if fc.rev() < limit and fc.rev() is not None: continue visit += fc.parents()