Show More
@@ -1531,7 +1531,8 b' def debugbuilddag(ui, repo, text=None,' | |||||
1531 | if len(ps) > 1: |
|
1531 | if len(ps) > 1: | |
1532 | p2 = repo[ps[1]] |
|
1532 | p2 = repo[ps[1]] | |
1533 | pa = p1.ancestor(p2) |
|
1533 | pa = p1.ancestor(p2) | |
1534 |
base, local, other = [x[fn].data() for x in pa, p1, |
|
1534 | base, local, other = [x[fn].data() for x in (pa, p1, | |
|
1535 | p2)] | |||
1535 | m3 = simplemerge.Merge3Text(base, local, other) |
|
1536 | m3 = simplemerge.Merge3Text(base, local, other) | |
1536 | ml = [l.strip() for l in m3.merge_lines()] |
|
1537 | ml = [l.strip() for l in m3.merge_lines()] | |
1537 | ml.append("") |
|
1538 | ml.append("") |
General Comments 0
You need to be logged in to leave comments.
Login now