Tue, 26 Apr 2022 09:06:30 -0700 | Martin von Zweigbergk | filemerge: add configs to disable some or all partial merge tools | file | diff | annotate |
Thu, 17 Mar 2022 11:19:06 -0700 | Martin von Zweigbergk | partial-merge: add support for `.args` config (`$local` etc.) | file | diff | annotate |
Tue, 18 Jan 2022 13:05:21 -0800 | Martin von Zweigbergk | filemerge: add support for partial conflict resolution by external tool | file | diff | annotate |