From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Jul 2022 20:00:28 +0000 (-0700)
Subject: Merge branch 'en/merge-dual-dir-renames-fix' into maint
X-Git-Tag: v2.37.2~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5c5e343d00eefb436a8643c5308205ce4e69b13;p=thirdparty%2Fgit.git

Merge branch 'en/merge-dual-dir-renames-fix' into maint

Fixes a long-standing corner case bug around directory renames in
the merge-ort strategy.
source: <pull.1268.v4.git.1656984823.gitgitgadget@gmail.com>

* 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
---

e5c5e343d00eefb436a8643c5308205ce4e69b13