| commit | 2c5410480ea7ea92e39667fedc8eba1f7a95bc9e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Jan 2022 19:52:55 +0000 (10 11:52 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Jan 2022 19:52:55 +0000 (10 11:52 -0800) | ||
| tree | 5596e9549e0ce5730a2b74f87be407d55b2dd249 | treesnapshot (tar.gz zip) |
| parent | def8c6a05d3e06d70ce71c6f8cd0d2656dd6c966 | commitdiff |
| parent | d30126c20d5899f128facbd33ecf27163efe1326 | commitdiff |
Merge branch 'en/merge-ort-renorm-with-rename-delete-conflict-fix'
A corner case bug in the ort merge strategy has been corrected.
* en/merge-ort-renorm-with-rename-delete-conflict-fix:
merge-ort: fix bug with renormalization and rename/delete conflicts
A corner case bug in the ort merge strategy has been corrected.
* en/merge-ort-renorm-with-rename-delete-conflict-fix:
merge-ort: fix bug with renormalization and rename/delete conflicts