Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
[gitweb.git]
/
t
/
t6035-merge-dir-to-symlink.sh
diff --git
a/t/t6035-merge-dir-to-symlink.sh
b/t/t6035-merge-dir-to-symlink.sh
index 3202e1de6d01bf3c36e82351c7f8426cc2bb44ab..cd3190c4a61f0404491b41a1b22f5143b63f4992 100755
(executable)
--- a/
t/t6035-merge-dir-to-symlink.sh
+++ b/
t/t6035-merge-dir-to-symlink.sh
@@
-5,7
+5,7
@@
test_description='merging when a directory was replaced with a symlink'
if ! test_have_prereq SYMLINKS
then
- s
ay
'Symbolic links not supported, skipping tests.'
+ s
kip_all=
'Symbolic links not supported, skipping tests.'
test_done
fi