Merge branch 'mp/t7060-diff-index-test'
commit971f9ea54313d189e6a79395b5a6e335101bd85a
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Sep 2015 18:46:28 +0000 (14 11:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Sep 2015 18:46:31 +0000 (14 11:46 -0700)
treea72e52a90f2dbceca13b69d9776f99012df8b06b
parente0eeba263c19f0cd2e5ca3cad305d61b2d837a63
parentb894d3e7881cf48770a25fb16a90310afa30834f
Merge branch 'mp/t7060-diff-index-test'

Fix an old test that was doing the same thing as another one.

* mp/t7060-diff-index-test:
  t7060: actually test "git diff-index --cached -M"
t/t7060-wtstatus.sh