]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0a6c66 ff6d547)
Merge branch 'en/disable-dir-rename-in-recursive-merge'
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 Aug 2019 21:26:10 +0000 (14:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Aug 2019 21:26:10 +0000 (14:26 -0700)
"merge-recursive" hit a BUG() when building a virtual merge base
detected a directory rename.

* en/disable-dir-rename-in-recursive-merge:
  merge-recursive: avoid directory rename detection in recursive case

1  2 
merge-recursive.c patch | diff1 | diff2 | blob | history

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