Tue, 11 Jan 2022 16:54:42 -0800 | Martin von Zweigbergk | simplemerge: clarify names of functions that render conflict markers | changeset | files |
Fri, 07 Jan 2022 22:16:22 -0800 | Martin von Zweigbergk | simplemerge: make merge_lines() a free function | changeset | files |
Fri, 07 Jan 2022 18:42:31 -0800 | Martin von Zweigbergk | simplemerge: convert `merge_lines()` away from generator | changeset | files |
Tue, 14 Dec 2021 13:12:56 -0800 | Martin von Zweigbergk | simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels | changeset | files |
Fri, 14 Jan 2022 10:25:45 -0800 | Martin von Zweigbergk | rust: upgrade `rand*` crates | changeset | files |
Thu, 06 Jan 2022 22:09:40 -0800 | Martin von Zweigbergk | logcmdutil: raise `StateError` when file to follow doesn't exist | changeset | files |
Thu, 06 Jan 2022 22:03:21 -0800 | Martin von Zweigbergk | logcmdutil: raise `InputError` on bad CLI arguments | changeset | files |