On Fri, Sep 6, 2024 at 2:49 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > An unrelated #leftoverbits tangent. > > We probably should teach add "union" as a valid choice in > .recursive_variant in merge-recursive.c:parse_merge_opt(), together > with "ours" and "theirs" that are already supported. I agree, that would be really nice, and it would simplify the tests for `git apply -3 --union`. The other changes you requested are done in v2. Thanks for the feedback! -Alex
