log

age author description
Thu, 20 Jan 2022 11:17:09 -0800 Martin von Zweigbergk filemerge: remove unused arguments from `_merge()`
Thu, 20 Jan 2022 11:00:30 -0800 Martin von Zweigbergk simplemerge: take arguments as annotated context objects
Thu, 20 Jan 2022 09:04:39 -0800 Martin von Zweigbergk filemerge: make `labels` a required arg for `_premerge()`
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
Mon, 17 Jan 2022 21:20:46 -0500 Valentin Gatien-Baron blackbox: change year in logs to ISO 8601 format
Mon, 17 Jan 2022 21:00:33 -0500 Valentin Gatien-Baron blackbox: add milliseconds to blackbox logs by default