From 8523d071ad350539ab0f7e6efe192b8530320962 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 25 Mar 2011 14:08:36 -0400 Subject: [PATCH] t7607: mark known breakage in test 11 as fixed This was fixed by 1d718a51 (do not overwrite untracked symlinks, 2011-02-20). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/t7607-merge-overwrite.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh index 5f731a1177..691c5fda30 100755 --- a/t/t7607-merge-overwrite.sh +++ b/t/t7607-merge-overwrite.sh @@ -122,7 +122,7 @@ test_expect_success 'will not overwrite untracked file in leading path' ' rm -f sub sub2 ' -test_expect_failure SYMLINKS 'will not overwrite untracked symlink in leading path' ' +test_expect_success SYMLINKS 'will not overwrite untracked symlink in leading path' ' git reset --hard c0 && rm -rf sub && mkdir sub2 && -- 2.11.4.GIT