Merge branch 'js/color-on-windows-comment' into maint

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 7ce4cd753eb0c50f42b68653da79f90b19edd764..42a2929835b5c77e5b3031ce56ad1243afb56971 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -446,7 +446,7 @@ write_script .git/CHECK_SYMLINKS <<\EOF
 for f in file file2 sub/sub
 do
        echo "$f"
-       readlink "$2/$f"
+       ls -ld "$2/$f" | sed -e 's/.* -> //'
 done >actual
 EOF