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)
commit0bdaec1...3db90d69041531311fb34fa09639589b
tree6820529...8aecd2a0285cded426791b4f47335de9copy hash to clipboard (tree)
parentc0a6c66...4dcb660a31ac8b716a89a8911b1ab6d6copy hash to clipboard (diff)
parentff6d547...1af2c92867f773a264200f22b4cb2ab9copy hash to clipboard (diff)
merge-recursive.c