提交 b6b0737d 编写于 作者: J Johannes Sixt 提交者: Junio C Hamano

t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite

Signed-off-by: NJohannes Sixt <j6t@kdbg.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 b6986d8a
......@@ -3,6 +3,12 @@
test_description='merging when a directory was replaced with a symlink'
. ./test-lib.sh
if ! test_have_prereq SYMLINKS
then
say 'Symbolic links not supported, skipping tests.'
test_done
fi
test_expect_success 'create a commit where dir a/b changed to symlink' '
mkdir -p a/b/c a/b-2/c &&
> a/b/c/d &&
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册