changeset 15774 | 0bd17a4bed88 |
parent 15674 | 7b7f03502b5a |
child 15894 | 44fa047cef57 |
--- a/mercurial/merge.py Tue Jan 03 17:13:03 2012 -0600 +++ b/mercurial/merge.py Wed Jan 04 15:48:02 2012 -0600 @@ -183,7 +183,7 @@ pa = p1.p1() elif pa and repo.ui.configbool("merge", "followcopies", True): dirs = repo.ui.configbool("merge", "followdirs", True) - copy, diverge = copies.copies(repo, p1, p2, pa, dirs) + copy, diverge = copies.mergecopies(repo, p1, p2, pa, dirs) for of, fl in diverge.iteritems(): act("divergent renames", "dr", of, fl)