diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-11-26 10:32:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-11-26 10:32:40 -0800 |
| commit | 716e871d50dc63a6f436442b127571b9268a75a3 (patch) | |
| tree | 92dc1f5ea580372a30dbf2a283eeb05020af4a5d /diff.c | |
| parent | 42bf8a534ba350d7ddc46b111b59e4e875046994 (diff) | |
| parent | a562d90a350dcbddc8794809aef9608467022e34 (diff) | |
Merge branch 'en/ort-rename-another-fix'
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 'diff.c')
0 files changed, 0 insertions, 0 deletions