Show More
@@ -154,7 +154,7 b' def copies(repo, c1, c2, ca, checkdirs=F' | |||||
154 | break # no merge needed, quit early |
|
154 | break # no merge needed, quit early | |
155 | c2 = ctx(of, m2[of]) |
|
155 | c2 = ctx(of, m2[of]) | |
156 | cr = related(oc, c2, ca.rev()) |
|
156 | cr = related(oc, c2, ca.rev()) | |
157 |
if |
|
157 | if cr and (cr.path() == f or cr.path == c2.path()): # non-divergent | |
158 | copy[f] = of |
|
158 | copy[f] = of | |
159 | of = None |
|
159 | of = None | |
160 | break |
|
160 | break |
General Comments 0
You need to be logged in to leave comments.
Login now