diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-24 00:52:28 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-24 00:52:28 +0300 |
| commit | 1d5baf3aeda5377d3d79e580da327969a1b3b572 (patch) | |
| tree | 0c87bcebafb7cf72d976e6a5a236d00a4582268d /alias.c | |
| parent | 1c11c74eb3b492a69989705114c29133e517184f (diff) | |
| parent | 331c6be1d19d290d58aa42af007c5111106d5780 (diff) | |
Merge branch 'ad/custom-merge-placeholder-for-symbolic-pathnames' into seen
The labels on conflict markers for the common ancestor, our version,
and the other version are available to custom 3-way merge driver
via %S, %X, and %Y placeholders.
* ad/custom-merge-placeholder-for-symbolic-pathnames:
merge-ll: expose revision names to custom drivers
Diffstat (limited to 'alias.c')
0 files changed, 0 insertions, 0 deletions