Subject: Re: [PATCH v3 04/11] merge-index: don't fork if the requested program is `git-merge-one-file'

From: Junio C Hamano <[email-masked]>
Date: Fri, 16 Oct 2020 12:07:01 -0700

Alban Gruin <[email-masked]> writes:

> Since `git-merge-one-file' has been rewritten and libified, this teaches
> `merge-index' to call merge_strategies_one_file() without forking using
> a new callback, merge_one_file_cb().
>
> Signed-off-by: Alban Gruin <[email-masked]>
> ---

I do not know how much of the change in this patch survives when the
previous step gets adjusted, so I'll skip this step for now.

Thanks.