diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-07-18 13:31:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-18 13:31:56 -0700 |
| commit | e3349f288826d54ee056330222a902360c192b0b (patch) | |
| tree | fe892a39a65b5184034908eee55cf4cf1334f5cf /diff.c | |
| parent | Merge branch 'ab/test-without-templates' (diff) | |
| parent | merge-ort: fix issue with dual rename and add/add conflict (diff) | |
| download | git-e3349f288826d54ee056330222a902360c192b0b.tar.gz git-e3349f288826d54ee056330222a902360c192b0b.zip | |
Merge branch 'en/merge-dual-dir-renames-fix'
Fixes a long-standing corner case bug around directory renames in
the merge-ort strategy.
* en/merge-dual-dir-renames-fix:
merge-ort: fix issue with dual rename and add/add conflict
merge-ort: shuffle the computation and cleanup of potential collisions
merge-ort: make a separate function for freeing struct collisions
merge-ort: small cleanups of check_for_directory_rename
t6423: add tests of dual directory rename plus add/add conflict
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions