log

age author description
Tue, 18 Jan 2022 13:23:49 -0800 Martin von Zweigbergk update: set custom conflict label for base commit
Tue, 18 Jan 2022 15:04:55 -0800 Martin von Zweigbergk merge: set custom conflict label for base commit
Tue, 18 Jan 2022 14:57:15 -0800 Martin von Zweigbergk rebase: set custom conflict label for base commit
Thu, 20 Jan 2022 11:06:52 -0800 Martin von Zweigbergk simplemerge: take over formatting of label from `filemerge`