read-cache: fix directory/file conflict handling in read_index_unmerged()

diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index 411550d2b6e9085c5e7f93c25effec7b130f0401..de77bfaf4fa99715977b5f4b8bec7d374791dfa8 100755 (executable)
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -235,7 +235,6 @@ test_expect_success 'setup content merge + rename/directory conflict' '
 '
 
 test_expect_success 'rename/directory conflict + clean content merge' '
-       git reset --hard &&
        git reset --hard &&
        git clean -fdqx &&
 
@@ -259,7 +258,6 @@ test_expect_success 'rename/directory conflict + clean content merge' '
 '
 
 test_expect_success 'rename/directory conflict + content merge conflict' '
-       git reset --hard &&
        git reset --hard &&
        git clean -fdqx &&