log

age author description
Tue, 11 Jan 2022 22:13:56 -0800 Martin von Zweigbergk simplemerge: change _minimize() to minimize a single conflict
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()`