t6020, t6022, t6035: update merge tests to use test helper functions

[thirdparty/git.git] / t / t6020-merge-df.sh

diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index 46b506b3b7b6f6308994082abda2fcaddaaadf0e..cf662068da19c0fdf0d1488982e9779c39aee21b 100755 (executable)
--- a/t/t6020-merge-df.sh
+++ b/t/t6020-merge-df.sh
@@ -83,9 +83,9 @@ test_expect_success 'modify/delete + directory/file conflict' '
        test 4 -eq $(git ls-files -u | wc -l) &&
        test 1 -eq $(git ls-files -o | wc -l) &&
 
-       test -f letters/file &&
-       test -f letters.txt &&
-       test -f letters~modify
+       test_path_is_file letters/file &&
+       test_path_is_file letters.txt &&
+       test_path_is_file letters~modify
 '
 
 test_expect_success 'modify/delete + directory/file conflict; other way' '
@@ -99,9 +99,9 @@ test_expect_success 'modify/delete + directory/file conflict; other way' '
        test 4 -eq $(git ls-files -u | wc -l) &&
        test 1 -eq $(git ls-files -o | wc -l) &&
 
-       test -f letters/file &&
-       test -f letters.txt &&
-       test -f letters~HEAD
+       test_path_is_file letters/file &&
+       test_path_is_file letters.txt &&
+       test_path_is_file letters~HEAD
 '
 
 test_done