]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 729e6dc 83e3ad3)
Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Sep 2019 04:42:14 +0000 (13:42 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Sep 2019 04:42:14 +0000 (13:42 +0900)
commita5d6788e2e915bb7b5df36e9d7b871e7002d8f9f
tree17f2b5a2cf0ad0c2303637ceb1e10a5ea2806504tree | snapshot
parent729e6dc708cacd73adf5c7dade9c20aa000a5b27commit | diff
parent83e3ad3b126125d23eea10283d85682a1a680daacommit | diff
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
merge-recursive.c diff1 | diff2 | blob | history
t/t3030-merge-recursive.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.