# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2007-05-03 22:24:43
# Node ID 93652499bed395f02d481e195b7a6fd66cabc86f
# Parent  3b7e284b8f28bb89fcc3fbea97eafca94c0c75c3

merge: simplify a check in checkcopies

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -157,7 +157,7 @@ def findcopies(repo, m1, m2, ma, limit):
             # named changed on only one side?
             if ca.path() == c.path() or ca.path() == c2.path():
                 fullcopy[c.path()] = of # remember for dir rename detection
-                if c == ca and c2 == ca: # no merge needed, ignore copy
+                if c == c2: # no merge needed, ignore copy
                     continue
                 copy[c.path()] = of