stat_tracking_info(): clear object flags used during counting

[git.git] / t / t6024-recursive-merge.sh

diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
index 149ea8543af153d39c8cba8c43bb3436aaaef3b4..6a6a13002d3dc66c043a43df910a79940b178da4 100755 (executable)
--- 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 &&