log

age author description
Mon, 24 Jan 2022 08:35:14 -0800 Martin von Zweigbergk relnotes: add note about changed labels texts
Fri, 21 Jan 2022 13:48:48 -0800 Martin von Zweigbergk graft: attempt to make merge labels more helpful
Fri, 21 Jan 2022 13:49:11 -0800 Martin von Zweigbergk shelve: attempt to make merge labels more helpful
Fri, 21 Jan 2022 13:48:18 -0800 Martin von Zweigbergk histedit: attempt to make merge labels more helpful
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`
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