Merge branch 'sg/doc-test-must-fail-args' into maint

author Junio C Hamano <gitster@pobox.com>

Thu, 22 Mar 2018 21:24:19 +0000 (14:24 -0700)

committer Junio C Hamano <gitster@pobox.com>

Thu, 22 Mar 2018 21:24:20 +0000 (14:24 -0700)
author Junio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:24:19 +0000 (14:24 -0700)
committer Junio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:24:20 +0000 (14:24 -0700)
diff --cc t/README
Simple merge
diff --cc t/test-lib-functions.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Thu, 22 Mar 2018 21:24:19 +0000 (14:24 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 22 Mar 2018 21:24:20 +0000 (14:24 -0700)
		1	2
t/README	patch \|	diff1 \|	diff2 \|	blob \| history
t/test-lib-functions.sh	patch \|	diff1 \|	diff2 \|	blob \| history