Merge branch 'en/t7405-recursive-submodule-conflicts'
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)
commitc990330...0ff7511864e404c18040ffa236f81404
tree087e4db...8336f821b532e01b409af338a9ea05afcopy hash to clipboard (tree)
parente6da45c...cd40afcd8dc8462fc714532ec6d673f6copy hash to clipboard (diff)
parent587421e...ddec17e6e9aaf55b61aa40ad4ad9e43ecopy hash to clipboard (diff)