Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 4399 93652499bed3
parent 4398 3b7e284b8f28
child 4400 84cd52b48f94 
--- 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
mercurial