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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Mar 25, 2011 at 14:08 UTC
8523d071ad350539ab0f7e6efe192b8530320962
1 file changed
+1
-1
t/t7607-merge-overwrite.sh
+1
-1
@@ -122,7 +122,7 @@ test_expect_success 'will not overwrite untracked file in leading path' '
122
rm -f sub sub2
123
'
124
125
-test_expect_failure SYMLINKS 'will not overwrite untracked symlink in leading path' '
125
+test_expect_success SYMLINKS 'will not overwrite untracked symlink in leading path' '
126
git reset --hard c0 &&
127
rm -rf sub &&
128
mkdir sub2 &&