diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-11-08 10:05:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-11-08 10:05:35 -0800 |
| commit | 14088b9edc5d101a114e7b8b8f35a47c8be8a116 (patch) | |
| tree | 11e0e2aadb85caa39ab7f20c87b0180e696430d8 /t/unit-tests/clar/example/example.c | |
| parent | Merge branch 'sa/replay-atomic-ref-updates' into jch (diff) | |
| parent | merge-ort: fix failing merges in special corner case (diff) | |
| download | git-14088b9edc5d101a114e7b8b8f35a47c8be8a116.tar.gz git-14088b9edc5d101a114e7b8b8f35a47c8be8a116.zip | |
Merge branch 'en/ort-rename-another-fix' into jch
Yet another corner case fix around renames in the "ort" merge
strategy.
* en/ort-rename-another-fix:
merge-ort: fix failing merges in special corner case
merge-ort: remove debugging crud
t6429: update comment to mention correct tool
Diffstat (limited to 't/unit-tests/clar/example/example.c')
0 files changed, 0 insertions, 0 deletions