From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Sep 2015 18:46:28 +0000 (-0700)
Subject: Merge branch 'mp/t7060-diff-index-test'
X-Git-Tag: v2.6.0-rc2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=971f9ea54313d189e6a79395b5a6e335101bd85a;p=git

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

971f9ea54313d189e6a79395b5a6e335101bd85a