Mercurial > hg-stable
log
age | author | description |
---|---|---|
Tue, 11 Jan 2022 22:03:55 -0800 | Martin von Zweigbergk | simplemerge: make minimize() a free function |
Tue, 11 Jan 2022 21:56:27 -0800 | Martin von Zweigbergk | simplemerge: simplify and rename `render_markers()` |
Tue, 11 Jan 2022 16:23:10 -0800 | Martin von Zweigbergk | simplemerge: split out function for rendering :merge3 conflict markers |