Mercurial > public > mercurial-scm > hg
diff mercurial/debugcommands.py @ 48557:c6649c53073f
simplemerge: make merge_lines() a free function
IMO, the rendering of a conflict as text with merge markers should be
separate from the code for resolving conflicts. The latter is what
`Merge3Text` is mostly about already.
Differential Revision: https://phab.mercurial-scm.org/D11974
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 07 Jan 2022 22:16:22 -0800 |
| parents | ce8c82a5cd65 |
| children | 2dbee604a4f0 |
line wrap: on
line diff
--- a/mercurial/debugcommands.py Fri Jan 07 18:42:31 2022 -0800 +++ b/mercurial/debugcommands.py Fri Jan 07 22:16:22 2022 -0800 @@ -272,7 +272,7 @@ x[fn].data() for x in (pa, p1, p2) ] m3 = simplemerge.Merge3Text(base, local, other) - ml = [l.strip() for l in m3.merge_lines()[0]] + ml = [l.strip() for l in simplemerge.merge_lines(m3)[0]] ml.append(b"") elif at > 0: ml = p1[fn].data().split(b"\n")