Merge branch 'sg/split-index-test' into maint

author Junio C Hamano <gitster@pobox.com>

Wed, 21 Nov 2018 13:57:57 +0000 (22:57 +0900)

committer Junio C Hamano <gitster@pobox.com>

Wed, 21 Nov 2018 13:57:57 +0000 (22:57 +0900)
author Junio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:57 +0000 (22:57 +0900)
committer Junio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:57 +0000 (22:57 +0900)
diff --cc t/t0090-cache-tree.sh
Simple merge
diff --cc t/t1700-split-index.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Wed, 21 Nov 2018 13:57:57 +0000 (22:57 +0900)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 21 Nov 2018 13:57:57 +0000 (22:57 +0900)
		1	2
t/t0090-cache-tree.sh	patch \|	diff1 \|	diff2 \|	blob \| history
t/t1700-split-index.sh	patch \|	diff1 \|	diff2 \|	blob \| history