From: Junio C Hamano Date: Mon, 30 Sep 2019 04:42:14 +0000 (+0900) Subject: Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way' into next X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5d6788e2e915bb7b5df36e9d7b871e7002d8f9f;p=git Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way' into next 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 --- a5d6788e2e915bb7b5df36e9d7b871e7002d8f9f