Thu, 20 Jan 2022 11:00:30 -0800 | Martin von Zweigbergk | simplemerge: take arguments as annotated context objects | changeset | files |
Thu, 20 Jan 2022 09:04:39 -0800 | Martin von Zweigbergk | filemerge: make `labels` a required arg for `_premerge()` | changeset | files |
Thu, 20 Jan 2022 14:46:16 -0800 | Martin von Zweigbergk | filemerge: remove unnecessary check for empty string | changeset | files |
Thu, 20 Jan 2022 23:07:35 -0800 | Martin von Zweigbergk | tests: also test spaces in conflict marker labels | changeset | files |
Mon, 17 Jan 2022 21:20:46 -0500 | Valentin Gatien-Baron | blackbox: change year in logs to ISO 8601 format | changeset | files |
Mon, 17 Jan 2022 21:00:33 -0500 | Valentin Gatien-Baron | blackbox: add milliseconds to blackbox logs by default | changeset | files |
Mon, 17 Jan 2022 20:47:46 -0500 | Valentin Gatien-Baron | blackbox: correct date format doc | changeset | files |
Tue, 18 Jan 2022 10:27:13 +0100 | Raphaël Gomès | branching: merge with stable | changeset | files |