Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t/t1304: use 'test -r' to test readability rather than looking at mode bits
[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 d1b22871c40674582e6999804102afb95283b653..3202e1de6d01bf3c36e82351c7f8426cc2bb44ab 100755
(executable)
--- a/
t/t6035-merge-dir-to-symlink.sh
+++ b/
t/t6035-merge-dir-to-symlink.sh
@@
-48,7
+48,7
@@
test_expect_success 'setup for merge test' '
git tag baseline
'
-test_expect_
failure
'do not lose a/b-2/c/d in merge (resolve)' '
+test_expect_
success
'do not lose a/b-2/c/d in merge (resolve)' '
git reset --hard &&
git checkout baseline^0 &&
git merge -s resolve master &&