X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6024-recursive-merge.sh;h=23d24d3feb9d1f3b5875771639a8e6d991d5ed76;hb=adf59ec127f447aa83c84f9dbe2ae4e6417f3760;hp=149ea8543af153d39c8cba8c43bb3436aaaef3b4;hpb=aa8d53ec387a7baf72ab5e3a91c35bb5bf20eb4d;p=git.git

diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
index 149ea8543..23d24d3fe 100755
--- a/t/t6024-recursive-merge.sh
+++ b/t/t6024-recursive-merge.sh
@@ -81,8 +81,8 @@ EOF
 
 test_expect_success "virtual trees were processed" "git diff 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 &&