diff -r 7bbabfe25321 -r c12d4aceba79 mercurial/copies.py
--- a/mercurial/copies.py	Fri Feb 24 18:21:06 2012 -0600
+++ b/mercurial/copies.py	Sat Feb 25 14:22:58 2012 -0600
@@ -174,7 +174,7 @@
         return _backwardcopies(x, y)
     return _chain(x, y, _backwardcopies(x, a), _forwardcopies(a, y))
 
-def mergecopies(repo, c1, c2, ca, checkdirs=True):
+def mergecopies(repo, c1, c2, ca):
     """
     Find moves and copies between context c1 and c2 that are relevant
     for merging.
@@ -310,7 +310,7 @@
             repo.ui.debug("   %s -> %s %s\n" % (f, fullcopy[f], note))
     del diverge2
 
-    if not fullcopy or not checkdirs:
+    if not fullcopy:
         return copy, diverge
 
     repo.ui.debug("  checking for directory renames\n")