Merge branch 'en/abort-df-conflict-fixes'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:57 +0000 (13:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:57 +0000 (13:09 -0700)
commit8ba8642...d5d89629973268ff28bc5b0b3d45e35b
tree19a0cf5...bfa72424d0c9d746851092115747ada0copy hash to clipboard (tree)
parentc5d276c...184cc42fb90b60b14996253b855a3e06copy hash to clipboard (diff)
parentad37620...2a8d0029ff16bcbfbb2656c36cf3d662copy hash to clipboard (diff)
read-cache.c
t/t6042-merge-rename-corner-cases.sh