Show More
@@ -174,10 +174,7 b' def manifestmerge(repo, p1, p2, pa, over' | |||
|
174 | 174 | if partial and not partial(f): |
|
175 | 175 | continue |
|
176 | 176 | if f in m2: |
|
177 | if overwrite or backwards: | |
|
178 | rflags = m2.flags(f) | |
|
179 | else: | |
|
180 | rflags = fmerge(f, f, f) | |
|
177 | rflags = fmerge(f, f, f) | |
|
181 | 178 | # are files different? |
|
182 | 179 | if n != m2[f]: |
|
183 | 180 | a = ma.get(f, nullid) |
General Comments 0
You need to be logged in to leave comments.
Login now