log

age author description
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
Fri, 07 Jan 2022 18:42:31 -0800 Martin von Zweigbergk simplemerge: convert `merge_lines()` away from generator
Tue, 14 Dec 2021 13:12:56 -0800 Martin von Zweigbergk simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
Fri, 14 Jan 2022 10:25:45 -0800 Martin von Zweigbergk rust: upgrade `rand*` crates
Thu, 06 Jan 2022 22:09:40 -0800 Martin von Zweigbergk logcmdutil: raise `StateError` when file to follow doesn't exist