diff mercurial/debugcommands.py @ 48586:2dbee604a4f0

simplemerge: clarify names of functions that render conflict markers

Differential Revision: https://phab.mercurial-scm.org/D11975

--- a/mercurial/debugcommands.py	Fri Jan 07 22:16:22 2022 -0800
+++ b/mercurial/debugcommands.py	Tue Jan 11 16:54:42 2022 -0800
@@ -272,7 +272,9 @@
                             x[fn].data() for x in (pa, p1, p2)
                         ]
                         m3 = simplemerge.Merge3Text(base, local, other)
-                        ml = [l.strip() for l in simplemerge.merge_lines(m3)[0]]
+                        ml = [
+                            l.strip() for l in simplemerge.render_markers(m3)[0]
+                        ]
                         ml.append(b"")
                     elif at > 0:
                         ml = p1[fn].data().split(b"\n")