changeset 41397 | 0bd56c291359 |
parent 39390 | a65ad9b22a00 |
child 41676 | 0531dff73d0b |
--- a/hgext/largefiles/lfutil.py Mon Jan 21 15:29:14 2019 +0000 +++ b/hgext/largefiles/lfutil.py Fri Jan 25 23:36:23 2019 -0800 @@ -518,8 +518,8 @@ files = set(ctx.files()) if len(parents) == 2: mc = ctx.manifest() - mp1 = ctx.parents()[0].manifest() - mp2 = ctx.parents()[1].manifest() + mp1 = ctx.p1().manifest() + mp2 = ctx.p2().manifest() for f in mp1: if f not in mc: files.add(f)