log tests/test-merge-partial-tool.t @ 48981:f3aafd785e65

age author description
Tue, 18 Jan 2022 13:05:21 -0800 Martin von Zweigbergk filemerge: add support for partial conflict resolution by external tool