From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Oct 2020 19:07:01 GMT
Subject: Re: [PATCH v3 04/11] merge-index: don't fork if the requested program is `git-merge-one-file'
Message-ID: <xmqqv9faat2i.fsf@gitster.c.googlers.com>
In-Reply-To: <20201005122646.27994-5-alban.gruin@gmail.com>

Alban Gruin <alban.gruin@gmail.com> 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 <alban.gruin@gmail.com>
> ---

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.