Merge branch 'jn/subtree-test-fixes'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Aug 2018 22:08:27 +0000 (15:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Aug 2018 22:08:27 +0000 (15:08 -0700)
Test fix.

* jn/subtree-test-fixes:
subtree test: simplify preparation of expected results
subtree test: add missing && to &&-chain

Trivial merge