Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Oct 2019 02:33:02 +0000 (11:33 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Oct 2019 02:33:02 +0000 (11:33 +0900)
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


Trivial merge