diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-12 14:18:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-12 14:18:32 -0700 |
| commit | 02536ed6754f166560eef522aaf65224431a1fce (patch) | |
| tree | 2fad2b59ce9de035f86b4600bd48b1a6face2133 /diff-lib.c | |
| parent | Merge branch 'ua/t1517-short-help-tests' into next (diff) | |
| parent | merge-ort: fix directory rename on top of source of other rename/delete (diff) | |
| download | git-02536ed6754f166560eef522aaf65224431a1fce.tar.gz git-02536ed6754f166560eef522aaf65224431a1fce.zip | |
Merge branch 'en/ort-rename-fixes' into next
Various bugs about rename handling in "ort" merge strategy have
been fixed.
* en/ort-rename-fixes:
merge-ort: fix directory rename on top of source of other rename/delete
merge-ort: fix incorrect file handling
merge-ort: clarify the interning of strings in opt->priv->path
t6423: fix missed staging of file in testcases 12i,12j,12k
t6423: document two bugs with rename-to-self testcases
merge-ort: drop unnecessary temporary in check_for_directory_rename()
merge-ort: update comments to modern testfile location
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions