Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 16169:c12d4aceba79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: remove checkdirs options This removes the undocumented merge.followdirs option, which has always been true.
author Matt Mackall <mpm@selenic.com>
date Sat, 25 Feb 2012 14:22:58 -0600
parents 3eab42088be4
children c655e4acaa82
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Feb 24 18:21:06 2012 -0600
+++ b/mercurial/merge.py	Sat Feb 25 14:22:58 2012 -0600
@@ -188,8 +188,7 @@
     elif pa == p2: # backwards
         pa = p1.p1()
     elif pa and repo.ui.configbool("merge", "followcopies", True):
-        dirs = repo.ui.configbool("merge", "followdirs", True)
-        copy, diverge = copies.mergecopies(repo, p1, p2, pa, dirs)
+        copy, diverge = copies.mergecopies(repo, p1, p2, pa)
         for of, fl in diverge.iteritems():
             act("divergent renames", "dr", of, fl)