log

age author description
Tue, 19 Jan 2021 14:00:42 -0800 Martin von Zweigbergk resolve: also detect new :mergediff conflict markers
Mon, 18 Jan 2021 22:32:09 -0800 Martin von Zweigbergk simplemerge: delete unused find_unconflicted()
Fri, 04 Dec 2020 10:11:01 +0100 Pierre-Yves David perf: use the `perf--` prefix for perf command