Tue, 11 Jan 2022 16:54:42 -0800 | Martin von Zweigbergk | simplemerge: clarify names of functions that render conflict markers | file | diff | annotate |
Fri, 07 Jan 2022 22:16:22 -0800 | Martin von Zweigbergk | simplemerge: make merge_lines() a free function | file | diff | annotate |
Fri, 07 Jan 2022 18:42:31 -0800 | Martin von Zweigbergk | simplemerge: convert `merge_lines()` away from generator | file | diff | annotate |