summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Bögershausen <tboegi@web.de>2013-01-21 17:45:43 +0100
committerJunio C Hamano <gitster@pobox.com>2013-01-21 17:13:16 -0800
commit004c0be766f57ffbf5538aeb3edfd3c650f6ceae (patch)
tree235e819f4fef6a537184e44faa87dd0fdb4d1282
parent7e2010537e96d0a1144520222f20ba1dc3d61441 (diff)
downloadgit-004c0be766f57ffbf5538aeb3edfd3c650f6ceae.tar.gz
t0050: known breakage vanished in merge (case change)
This test case has passed since this commit: commit 0047dd2fd1fc1980913901c5fa098357482c2842 Author: Steffen Prohaska <prohaska@zib.de> Date: Thu May 15 07:19:54 2008 +0200 t0050: Fix merge test on case sensitive file systems Remove the known breakage by using test_expect_success Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t0050-filesystem.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index 78816d9d93..ccd685dc14 100755
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -77,7 +77,7 @@ $test_case 'rename (case change)' '
'
-$test_case 'merge (case change)' '
+test_expect_success 'merge (case change)' '
rm -f CamelCase &&
rm -f camelcase &&