log

age author description
Tue, 18 Jan 2022 13:22:55 -0800 Martin von Zweigbergk merge: fix documented order of `labels` argument
Tue, 18 Jan 2022 12:57:55 -0800 Martin von Zweigbergk filemerge: when not keeping premerge, don't write markers to context
Fri, 14 Jan 2022 08:17:13 -0800 Martin von Zweigbergk simplemerge: move printing of merge result to extension
Thu, 10 Feb 2022 15:48:01 -0800 Martin von Zweigbergk simplemerge: remove code for checking binary input now that callers do it
Thu, 10 Feb 2022 15:27:58 -0800 Martin von Zweigbergk simplemerge: let filemerge check for binary inputs
Thu, 10 Feb 2022 13:36:09 -0800 Martin von Zweigbergk simplemerge: let extension check for binary inputs (unless `--text`)
Thu, 10 Feb 2022 11:00:32 -0800 Martin von Zweigbergk simplemerge: store input data in MergeInput