Antonin Delpeuch 81effe9468 merge-ll: expose revision names to custom drivers ...

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2024-01-24 13:15:06 -08:00

49 KiB

Raw Blame History

View Raw