Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t7502-commit: fix spelling
[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 5b96fb0b37b8397342796fd3b9fec94c91063ba4..3202e1de6d01bf3c36e82351c7f8426cc2bb44ab 100755
(executable)
--- a/
t/t6035-merge-dir-to-symlink.sh
+++ b/
t/t6035-merge-dir-to-symlink.sh
@@
-74,7
+74,7
@@
test_expect_success 'setup a merge where dir a/b-2 changed to symlink' '
git tag test2
'
-test_expect_
failure
'merge should not have conflicts (resolve)' '
+test_expect_
success
'merge should not have conflicts (resolve)' '
git reset --hard &&
git checkout baseline^0 &&
git merge -s resolve test2 &&