log

age author description
Thu, 17 Mar 2022 11:19:06 -0700 Martin von Zweigbergk partial-merge: add support for `.args` config (`$local` etc.)
Tue, 18 Jan 2022 13:05:21 -0800 Martin von Zweigbergk filemerge: add support for partial conflict resolution by external tool