| commit | 1f4485b2194f662d82968bd6110fa63153df5298 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 7 Oct 2019 02:33:02 +0000 (7 11:33 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 7 Oct 2019 02:33:02 +0000 (7 11:33 +0900) | ||
| tree | 8b3ef3eb2cda368025b07a0084abf44701ec0960 | treesnapshot (tar.gz zip) |
| parent | 5ecdbfafd6e298990e1b165fde89575031485a5c | commitdiff |
| parent | 83e3ad3b126125d23eea10283d85682a1a680daa | commitdiff |
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
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