log

age author description
Fri, 28 Jan 2022 11:33:01 +0100 Pierre-Yves David rank: naive rank property computation and retrieval
Mon, 07 Feb 2022 22:54:38 -0800 Martin von Zweigbergk filemerge: move check for identical sides out of filemerge()
Mon, 07 Feb 2022 20:12:09 -0800 Martin von Zweigbergk mergestate: use an early return for trivial merges
Mon, 07 Feb 2022 14:07:04 -0800 Martin von Zweigbergk simplemerge: remove now-unused arguments
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
Fri, 04 Feb 2022 18:36:36 -0800 Martin von Zweigbergk simplemerge: convert MergeInput to regular, non-attr.ib class
Thu, 10 Feb 2022 09:59:07 -0800 Martin von Zweigbergk simplemerge: replace `**opts` passed to `simplemerge()` by keyword arguments
Wed, 25 Aug 2021 19:55:20 -0700 Gregory Szorc automation: use gp3 volume type stable
Thu, 26 Aug 2021 17:47:50 -0700 Gregory Szorc automation: use m6i instances stable