Show More
| @@ -415,6 +415,7 b' def manifestmerge(repo, wctx, p2, pa, br' | |||||
| 415 | if partial and not partial(f): |
|
415 | if partial and not partial(f): | |
| 416 | continue |
|
416 | continue | |
| 417 | if n1 and n2: |
|
417 | if n1 and n2: | |
|
|
418 | if True: | |||
| 418 | fa = f |
|
419 | fa = f | |
| 419 | a = ma.get(f, nullid) |
|
420 | a = ma.get(f, nullid) | |
| 420 | if a == nullid: |
|
421 | if a == nullid: | |
General Comments 0
You need to be logged in to leave comments.
Login now