diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-02 11:31:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-02 11:31:50 -0800 |
| commit | 9e189a03da8004193e21c8920cafbf4aa7aa3b3b (patch) | |
| tree | e18c1ae0df21b6229c3a883e88e7f2a98700e30d /t/unit-tests/t-basic.c | |
| parent | Merge branch 'jc/reffiles-tests' (diff) | |
| parent | merge-ll: expose revision names to custom drivers (diff) | |
| download | git-9e189a03da8004193e21c8920cafbf4aa7aa3b3b.tar.gz git-9e189a03da8004193e21c8920cafbf4aa7aa3b3b.zip | |
Merge branch 'ad/custom-merge-placeholder-for-symbolic-pathnames'
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 't/unit-tests/t-basic.c')
0 files changed, 0 insertions, 0 deletions