Mercurial > hg-stable

changeset 4399:93652499bed3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify a check in checkcopies
author Matt Mackall <mpm@selenic.com>
date Thu, 03 May 2007 17:24:43 -0500
parents 3b7e284b8f28
children 84cd52b48f94
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Thu May 03 17:24:43 2007 -0500
+++ b/mercurial/merge.py	Thu May 03 17:24:43 2007 -0500
@@ -157,7 +157,7 @@
             # 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