Show More
@@ -157,7 +157,7 b' def findcopies(repo, m1, m2, ma, limit):' | |||||
157 | # named changed on only one side? |
|
157 | # named changed on only one side? | |
158 | if ca.path() == c.path() or ca.path() == c2.path(): |
|
158 | if ca.path() == c.path() or ca.path() == c2.path(): | |
159 | fullcopy[c.path()] = of # remember for dir rename detection |
|
159 | fullcopy[c.path()] = of # remember for dir rename detection | |
160 |
if c == |
|
160 | if c == c2: # no merge needed, ignore copy | |
161 | continue |
|
161 | continue | |
162 | copy[c.path()] = of |
|
162 | copy[c.path()] = of | |
163 |
|
163 |
General Comments 0
You need to be logged in to leave comments.
Login now