]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit0bdaec1d3db90d69041531311fb34fa09639589b
tree6820529b8aecd2a0285cded426791b4f47335de9tree | snapshot
parentc0a6c6614dcb660a31ac8b716a89a8911b1ab6d6commit | diff
parentff6d54771af2c92867f773a264200f22b4cb2ab9commit | diff
Merge branch 'en/disable-dir-rename-in-recursive-merge'

"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
merge-recursive.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.