From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Jan 2024 21:17:04 GMT
Subject: Re: [PATCH v4] merge-ll: expose revision names to custom drivers
Message-ID: <xmqqfrymbfe7.fsf@gitster.g>
In-Reply-To: <pull.1648.v4.git.git.1706126951879.gitgitgadget@gmail.com>

"Antonin Delpeuch via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Antonin Delpeuch <antonin@delpeuch.eu>
>
> Custom merge drivers need access to the names of the revisions they
> are working on, so that the merge conflict markers they introduce
> can refer to those revisions. The placeholders '%S', '%X' and '%Y'
> are introduced to this end.
>
> Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
> ---

This looks all good.

Let's declare a victory and merge it down to 'next' soonish.

Thanks for sticking to the topic.