equal
deleted
inserted
replaced
270 pa = p1.ancestor(p2) |
270 pa = p1.ancestor(p2) |
271 base, local, other = [ |
271 base, local, other = [ |
272 x[fn].data() for x in (pa, p1, p2) |
272 x[fn].data() for x in (pa, p1, p2) |
273 ] |
273 ] |
274 m3 = simplemerge.Merge3Text(base, local, other) |
274 m3 = simplemerge.Merge3Text(base, local, other) |
275 ml = [l.strip() for l in m3.merge_lines()] |
275 ml = [l.strip() for l in m3.merge_lines()[0]] |
276 ml.append(b"") |
276 ml.append(b"") |
277 elif at > 0: |
277 elif at > 0: |
278 ml = p1[fn].data().split(b"\n") |
278 ml = p1[fn].data().split(b"\n") |
279 else: |
279 else: |
280 ml = initialmergedlines |
280 ml = initialmergedlines |