X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7605-merge-resolve.sh;h=0cb9d11f2171de19b260391017310f0ee792f89b;hb=bc2fed496baa54ae99dede7da23dec938adbf0eb;hp=ee21a107fd99e35b9d6325a040b7549b7a6c2502;hpb=392f1300911120fbaa4b77c737fe13e205726aca;p=git.git

diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh
index ee21a107f..0cb9d11f2 100755
--- a/t/t7605-merge-resolve.sh
+++ b/t/t7605-merge-resolve.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-merge
+test_description='git merge
 
 Testing the resolve strategy.'
 
@@ -36,7 +36,9 @@ test_expect_success 'merge c1 to c2' '
 	git diff --exit-code &&
 	test -f c0.c &&
 	test -f c1.c &&
-	test -f c2.c
+	test -f c2.c &&
+	test 3 = $(git ls-tree -r HEAD | wc -l) &&
+	test 3 = $(git ls-files | wc -l)
 '
 
 test_expect_success 'merge c2 to c3 (fails)' '