diff -r 127281884959 -r 08e1baf924ca mercurial/merge.py
--- a/mercurial/merge.py	Wed Apr 22 00:56:06 2009 +0200
+++ b/mercurial/merge.py	Wed Apr 22 00:57:28 2009 +0200
@@ -166,7 +166,7 @@
         if repo.ui.configbool("merge", "followcopies", True):
             dirs = repo.ui.configbool("merge", "followdirs", True)
             copy, diverge = copies.copies(repo, p1, p2, pa, dirs)
-        copied = dict.fromkeys(copy.values())
+        copied = set(copy.values())
         for of, fl in diverge.iteritems():
             act("divergent renames", "dr", of, fl)