Mon, 07 Feb 2022 20:12:09 -0800 | Martin von Zweigbergk | mergestate: use an early return for trivial merges | changeset | files |
Mon, 07 Feb 2022 14:07:04 -0800 | Martin von Zweigbergk | simplemerge: remove now-unused arguments | changeset | files |
Tue, 18 Jan 2022 13:22:55 -0800 | Martin von Zweigbergk | merge: fix documented order of `labels` argument | changeset | files |
Tue, 18 Jan 2022 12:57:55 -0800 | Martin von Zweigbergk | filemerge: when not keeping premerge, don't write markers to context | changeset | files |
Fri, 14 Jan 2022 08:17:13 -0800 | Martin von Zweigbergk | simplemerge: move printing of merge result to extension | changeset | files |
Thu, 10 Feb 2022 15:48:01 -0800 | Martin von Zweigbergk | simplemerge: remove code for checking binary input now that callers do it | changeset | files |