simplemerge: simplify and rename `render_markers()`...
simplemerge: simplify and rename `render_markers()`
`render_markers()` now always renders minimized 2-way markers, so
let's simplify and rename it accordingly.
Differential Revision:
https://phab.mercurial-scm.org/D11979