diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-07 11:33:02 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 11:33:02 +0900 |
| commit | 1f4485b2194f662d82968bd6110fa63153df5298 (patch) | |
| tree | 8b3ef3eb2cda368025b07a0084abf44701ec0960 /commit.c | |
| parent | Merge branch 'ps/my-first-contribution-alphasort' (diff) | |
| parent | merge-recursive: symlink's descendants not in way (diff) | |
| download | git-1f4485b2194f662d82968bd6110fa63153df5298.tar.gz git-1f4485b2194f662d82968bd6110fa63153df5298.zip | |
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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions