]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
merge-recursive.c patch | diff1 | diff2 | blob | history
t/t3030-merge-recursive.sh patch | diff1 | diff2 | blob | history

diff --cc merge-recursive.c
Simple merge
diff --cc t/t3030-merge-recursive.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.