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
Mon, 17 Jan 2022 20:47:46 -0500 Valentin Gatien-Baron blackbox: correct date format doc
Tue, 18 Jan 2022 10:27:13 +0100 Raphaël Gomès branching: merge with stable
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -8 +8 +10 +30 +100 +300 +1000 +3000 tip