Merge branch 'cb/subtree-tests-update'
commit3cbb92054b2b9cafbf2a662f7858e5896d3e7ac4
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Jul 2015 21:17:56 +0000 (10 14:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jul 2015 21:17:56 +0000 (10 14:17 -0700)
tree492e445de21e3ddc79e51c110e7391f91333d158
parent615eb98a83347e8997fd68272653a668bd2fee43
parentedc8f710c74b82391e21b91abf7c418934b056a3
Merge branch 'cb/subtree-tests-update'

Tests update in contrib/subtree.

* cb/subtree-tests-update:
  contrib/subtree: small tidy-up to test
  contrib/subtree: fix broken &&-chains and revealed test error
  contrib/subtree: use tabs consitently for indentation in tests