diff options
| author | Antonin Delpeuch <antonin@delpeuch.eu> | 2024-01-24 20:09:11 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-24 13:15:06 -0800 |
| commit | 81effe94682dbfed55171468074db85fa661cc21 (patch) | |
| tree | df3b1a740b64d9dcb3c60330477f492c2373ad1a /git-svn.perl | |
| parent | 186b115d3062e6230ee296d1ddaa0c4b72a464b5 (diff) | |
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>
Diffstat (limited to 'git-svn.perl')
0 files changed, 0 insertions, 0 deletions