Merge pull request #10070 from keszybz/test-reporting

author Yu Watanabe <watanabe.yu+github@gmail.com>

Sat, 15 Sep 2018 06:55:15 +0000 (15:55 +0900)

committer GitHub <noreply@github.com>

Sat, 15 Sep 2018 06:55:15 +0000 (15:55 +0900)
author Yu Watanabe <watanabe.yu+github@gmail.com>
Sat, 15 Sep 2018 06:55:15 +0000 (15:55 +0900)
committer GitHub <noreply@github.com>
Sat, 15 Sep 2018 06:55:15 +0000 (15:55 +0900)
diff --cc NEWS
Simple merge
diff --cc src/journal/test-catalog.c
Simple merge
diff --cc src/test/test-path-lookup.c
Simple merge
author	Yu Watanabe <watanabe.yu+github@gmail.com>
	Sat, 15 Sep 2018 06:55:15 +0000 (15:55 +0900)
committer	GitHub <noreply@github.com>
	Sat, 15 Sep 2018 06:55:15 +0000 (15:55 +0900)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
src/journal/test-catalog.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/test-path-lookup.c	patch \|	diff1 \|	diff2 \|	blob \| history