2 commits

Author	SHA1	Message	Date
Martin von Zweigbergk	ef7b831411	merge: optimize 3-way merge case ... I haven't done any profiling to see if this is actually useful, but it's also pretty simple to do.	2023-05-24 22:00:38 -07:00
Martin von Zweigbergk	aa2792c5e5	merge: add a generic function for resolving trivial N-way merges ... We already resolve merge conflicts between hunks, trees, and refs, and maybe more. They each have their own code for the handling trivial merges (where the output is equal to one of the inputs). They look surprisingly different. This commit adds a generic function for doing that. Curiously, this new implementation uses implements it in yet another way (basically using a multi-set).	2023-05-24 22:00:38 -07:00