t6023-merge-file.sh: fix and mark as broken invalid tests

diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index 432f086c063198e82ad8a2f7c8dd175a8685fdf5..3115285c8ceecfdc4e7571b747b9dfa00834c49e 100755 (executable)
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -77,10 +77,10 @@ test_expect_success "merge without conflict (--quiet)" \
        "git merge-file --quiet test.txt orig.txt new2.txt"
 
 cp new1.txt test2.txt
-test_expect_success "merge without conflict (missing LF at EOF)" \
-       "git merge-file test2.txt orig.txt new2.txt"
+test_expect_failure "merge without conflict (missing LF at EOF)" \
+       "git merge-file test2.txt orig.txt new4.txt"
 
-test_expect_success "merge result added missing LF" \
+test_expect_failure "merge result added missing LF" \
        "test_cmp test.txt test2.txt"
 
 cp test.txt backup.txt