log

age author description
Fri, 19 Nov 2021 18:14:25 -0800 Martin von Zweigbergk filemerge: rename _formatconflictmarker() since it formats a label