Merge branch 'tk/t7104-test-path-is-file'

A test script 't7104' has been modernized to use 'test_path_is_file'
instead of 'test -f'.

* tk/t7104-test-path-is-file:
  t7104: use test_path_is_file instead of test -f

t/t7104-reset-hard.sh

@@ -29,7 +29,7 @@ test_expect_success 'reset --hard should restore unmerged ones' '
 
 	git reset --hard &&
 	git ls-files --error-unmatch before/1 before/2 hello later/3 &&
-	test -f hello
+	test_path_is_file hello
 
 '