log

age author description
Thu, 20 Jan 2022 14:46:16 -0800 Martin von Zweigbergk filemerge: remove unnecessary check for empty string
Thu, 20 Jan 2022 23:07:35 -0800 Martin von Zweigbergk tests: also test spaces in conflict marker labels