# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1175810127 25200
# Node ID 82be6af21697a6cc2a57208f3ac549d4ed3f0e77
# Parent  1043e4b27ab99748b95d70b4d81cc2aa5dcca7dc# Parent  09c5f734ff6a4c30697864fb895150ff799b3110
Merge with Matt

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -129,15 +129,15 @@ def findcopies(repo, m1, m2, ma, limit):
         '''check possible copies for filectx c'''
         for of in findold(c):
             if of not in man:
-                return
+                continue
             c2 = ctx(of, man[of])
             ca = c.ancestor(c2)
             if not ca: # unrelated
-                return
+                continue
             if ca.path() == c.path() or ca.path() == c2.path():
                 fullcopy[c.path()] = of
-                if c == ca or c2 == ca: # no merge needed, ignore copy
-                    return
+                if c == ca and c2 == ca: # no merge needed, ignore copy
+                    continue
                 copy[c.path()] = of
 
     def dirs(files):