From: Taylor Blau <me@ttaylorr.com>
Date: Mon, 31 Oct 2022 01:04:43 +0000 (-0400)
Subject: Merge branch 'en/ort-dir-rename-and-symlink-fix'
X-Git-Tag: v2.39.0-rc0~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=969230b64fe76972d55b55cee8136e43a7e84752;p=thirdparty%2Fgit.git

Merge branch 'en/ort-dir-rename-and-symlink-fix'

Merging a branch with directory renames into a branch that changes
the directory to a symlink was mishandled by the ort merge
strategy, which has been corrected.

* en/ort-dir-rename-and-symlink-fix:
  merge-ort: fix bug with dir rename vs change dir to symlink
---

969230b64fe76972d55b55cee8136e43a7e84752