Merge branch 'mp/t7060-diff-index-test'
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Sep 2015 18:46:28 +0000 (11:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Sep 2015 18:46:31 +0000 (11:46 -0700)
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"

1  2 
t/t7060-wtstatus.sh
Simple merge