Mercurial > public > mercurial-scm > hg-stable
log mercurial/debugcommands.py @ 48667:ff0233f36f6a
age | author | description |
---|---|---|
Tue, 11 Jan 2022 21:56:27 -0800 | Martin von Zweigbergk | simplemerge: simplify and rename `render_markers()` |
Tue, 11 Jan 2022 16:54:42 -0800 | Martin von Zweigbergk | simplemerge: clarify names of functions that render conflict markers |
Fri, 07 Jan 2022 22:16:22 -0800 | Martin von Zweigbergk | simplemerge: make merge_lines() a free function |