Merge branch 'en/t6036-merge-recursive-tests'
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:45 +0000 (15:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:45 +0000 (15:30 -0700)
commite6da45c...cd40afcd8dc8462fc714532ec6d673f6
tree9c5af89...c193984af147cbeb8a8ca23d3ab7b43ecopy hash to clipboard (tree)
parentc18ac30...9ebcf7b7e2fbd992744e63c71089a12acopy hash to clipboard (diff)
parent5d1daf3...cce5744b219002e0a6da015a13216cd1copy hash to clipboard (diff)
t/t6036-recursive-corner-cases.sh