--- a/mercurial/merge.py	Fri Jun 16 01:28:23 2017 +0530
+++ b/mercurial/merge.py	Fri Jun 16 01:46:47 2017 +0530
@@ -838,7 +838,7 @@
         for copykey, copyvalue in copy.iteritems():
             if copyvalue in relevantfiles:
                 relevantfiles.add(copykey)
-        for movedirkey in movewithdir.iterkeys():
+        for movedirkey in movewithdir:
             relevantfiles.add(movedirkey)
         filesmatcher = scmutil.matchfiles(repo, relevantfiles)
         matcher = matchmod.intersectmatchers(matcher, filesmatcher)