Re: [PATCH v4] merge-ll: expose revision names to custom drivers
"Antonin Delpeuch via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 9 quoted lines
> 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.
Junio C Hamano <gitster@pobox.com>