cygwin: trust executable bit by default

diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index a5b7a568bc60e49da317c2a525bdaff13f3e19d6..b8cb4906aa7de022543b594399b6fa9a83ffc847 100755 (executable)
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -50,9 +50,9 @@ test_expect_success 'M/D conflict does not segfault' '
                git commit -m delete &&
                test_must_fail git merge master &&
                test_must_fail git commit --dry-run >../actual &&
-               test_cmp ../expect ../actual &&
+               test_i18ncmp ../expect ../actual &&
                git status >../actual &&
-               test_cmp ../expect ../actual
+               test_i18ncmp ../expect ../actual
        )
 '