Show More
@@ -177,7 +177,7 b' def findcopies(repo, m1, m2, ma, limit):' | |||||
177 | continue |
|
177 | continue | |
178 | # named changed on only one side? |
|
178 | # named changed on only one side? | |
179 | if ca.path() == c.path() or ca.path() == c2.path(): |
|
179 | if ca.path() == c.path() or ca.path() == c2.path(): | |
180 |
if c == ca |
|
180 | if c == ca and c2 == ca: # no merge needed, ignore copy | |
181 | continue |
|
181 | continue | |
182 | copy[c.path()] = of |
|
182 | copy[c.path()] = of | |
183 |
|
183 |
General Comments 0
You need to be logged in to leave comments.
Login now