Subject: Re: [PATCH 5/7] merge-recursive: add merge function arg to 'merge_recursive_generic'

From: Junio C Hamano <[email-masked]>
Date: Mon, 25 Apr 2022 14:38:13 -0700

"Victoria Dye via GitGitGadget" <[email-masked]> writes:

> -	if (merge_recursive_generic(&o, &our_tree, &their_tree, 1, bases, &result)) {
> +	if (merge_recursive_generic(&o, &our_tree, &their_tree, 1, bases, merge_recursive, &result)) {

This one does need input from Elijah to properly evaluate.  Off the
top of my head, I wonder if the choice of the merge function should
be part of "struct merge_options".