From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Oct 2019 02:33:02 +0000 (+0900)
Subject: Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'
X-Git-Tag: v2.24.0-rc0~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f4485b2194f662d82968bd6110fa63153df5298;p=thirdparty%2Fgit.git

Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'

A bug in merge-recursive code that triggers when a branch with a
symbolic link is merged with a branch that replaces it with a
directory has been fixed.

* jt/merge-recursive-symlink-is-not-a-dir-in-way:
  merge-recursive: symlink's descendants not in way
---

1f4485b2194f662d82968bd6110fa63153df5298