Mercurial > hg-stable

diff mercurial/merge.py @ 15774:0bd17a4bed88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: split the copies api for "normal" and merge cases (API)
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Jan 2012 15:48:02 -0600
parents 7b7f03502b5a
children 44fa047cef57
line wrap: on
line diff
--- 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)