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

Test fix.

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