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"
git-mirror · Sep 14, 2015 · 971f9ea · 971f9ea
2 parents e0eeba2 + b894d3e
commit 971f9ea
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
@@ -106,7 +106,7 @@ test_expect_success 'git diff-index --cached -M shows 2 added + 1 unmerged' '
 	A	THREE
 	A	TWO
 	EOF
-	git diff-index --cached --name-status HEAD >actual &&
+	git diff-index --cached -M --name-status HEAD >actual &&
 	test_cmp expected actual
 '