global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-29 19:10:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'en/d-f-conflict-fix' into next

Browse Source 
* en/d-f-conflict-fix:
  t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
This commit is contained in:
Junio C Hamano
2010-07-28 16:06:28 -07:00
parent cb0551403e 2fd1ea1405
commit 75e8ac1bc0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t6035-merge-dir-to-symlink.sh
View File

@@ -72,7 +72,7 @@ test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolv
test -f a/b-2/c/d test -f a/b-2/c/d
' '
test_expect_failure 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' ' test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' '
git reset --hard && git reset --hard &&
git checkout master^0 && git checkout master^0 &&
git merge -s recursive baseline^0 && git merge -s recursive baseline^0 &&