X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6024-recursive-merge.sh;h=6a6a13002d3dc66c043a43df910a79940b178da4;hb=7ac749c96d143ba4f76723959892cbaddbe8ed07;hp=149ea8543af153d39c8cba8c43bb3436aaaef3b4;hpb=25c4f61c51a91051dcba3b8bbbac4c61aa69cc19;p=git.git

diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
index 149ea8543..6a6a13002 100755
--- a/t/t6024-recursive-merge.sh
+++ b/t/t6024-recursive-merge.sh
@@ -70,7 +70,7 @@ G
 >>>>>>> G:a1
 EOF
 
-test_expect_success "result contains a conflict" "git diff expect a1"
+test_expect_success "result contains a conflict" "test_cmp expect a1"
 
 git ls-files --stage > out
 cat > expect << EOF
@@ -79,10 +79,10 @@ cat > expect << EOF
 100644 fd7923529855d0b274795ae3349c5e0438333979 3	a1
 EOF
 
-test_expect_success "virtual trees were processed" "git diff expect out"
+test_expect_success "virtual trees were processed" "test_cmp expect out"
 
-git reset --hard
 test_expect_success 'refuse to merge binary files' '
+	git reset --hard &&
 	printf "\0" > binary-file &&
 	git add binary-file &&
 	git commit -m binary &&