317d316
< assert len(pctx) in (1, 2)
321,324c320,326
< mod_lines = modified_lines(pctx[0].data(), file_data, len(lines))
< if len(pctx) == 2:
< m2 = modified_lines(pctx[1].data(), file_data, len(lines))
< mod_lines = mod_lines & m2 # only the lines that are new in both
---
> if len(pctx) in (1, 2):
> mod_lines = modified_lines(pctx[0].data(), file_data, len(lines))
> if len(pctx) == 2:
> m2 = modified_lines(pctx[1].data(), file_data, len(lines))
> mod_lines = mod_lines & m2 # only the lines that are new in both
> else:
> mod_lines = xrange(0, len(lines))