"Antonin Delpeuch via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > From: Antonin Delpeuch <antonin@xxxxxxxxxxx> > > 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@xxxxxxxxxxx> > --- This looks all good. Let's declare a victory and merge it down to 'next' soonish. Thanks for sticking to the topic.
