From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Apr 2022 21:38:13 GMT
Subject: Re: [PATCH 5/7] merge-recursive: add merge function arg to 'merge_recursive_generic'
Message-ID: <xmqqwnfcu9mi.fsf@gitster.g>
In-Reply-To: <80c25c7587484ca32afcfd6cc054eab78dd1348a.1650908958.git.gitgitgadget@gmail.com>

"Victoria Dye via GitGitGadget" <gitgitgadget@gmail.com> 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".