From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Jul 2015 21:17:56 +0000 (-0700)
Subject: Merge branch 'cb/subtree-tests-update'
X-Git-Tag: v2.5.0-rc2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3cbb92054b2b9cafbf2a662f7858e5896d3e7ac4;p=thirdparty%2Fgit.git

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
---

3cbb92054b2b9cafbf2a662f7858e5896d3e7ac4