log

age author description
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`
Thu, 20 Jan 2022 16:16:05 -0800 Martin von Zweigbergk filemerge: pass `simplemerge.MergeInput` to tool functions
Thu, 20 Jan 2022 14:42:50 -0800 Martin von Zweigbergk filemerge: work with `simplemerge.MergeInput` in `filemerge()`
Thu, 20 Jan 2022 14:13:12 -0800 Martin von Zweigbergk filemerge: always define a "base" label
Thu, 20 Jan 2022 13:43:43 -0800 Martin von Zweigbergk filemerge: set default labels a little earlier
Tue, 18 Jan 2022 10:32:11 +0100 Raphaël Gomès helptext: add missing newline to Rust helptext stable