summaryrefslogtreecommitdiff
path: root/t/t6035-merge-dir-to-symlink.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-28 08:41:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-28 08:41:52 (GMT)
commitdf3dac3758e0b3e8178aff03fd0ceaf340735527 (patch)
tree0034e53144b06603d0a14d7bad514c3d37de4bbe /t/t6035-merge-dir-to-symlink.sh
parent7c3932334ef57e78f8cd170e3337f218646d7077 (diff)
downloadgit-df3dac3758e0b3e8178aff03fd0ceaf340735527.zip
git-df3dac3758e0b3e8178aff03fd0ceaf340735527.tar.gz
git-df3dac3758e0b3e8178aff03fd0ceaf340735527.tar.bz2
tests: update tests that used to fail
"diff --cc" output t4038 tests was fixed by b810cbb (diff --cc: a lost line at the beginning of the file is shown incorrectly, 2009-07-22), which was actually the commit that introduced this test.. An error in "git merge -s resolve" t6035 tests was fixed by 730f728 (unpack-trees.c: look ahead in the index, 2009-09-20). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6035-merge-dir-to-symlink.sh')
-rwxr-xr-xt/t6035-merge-dir-to-symlink.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh
index d1b2287..3202e1d 100755
--- a/t/t6035-merge-dir-to-symlink.sh
+++ b/t/t6035-merge-dir-to-symlink.sh
@@ -48,7 +48,7 @@ test_expect_success 'setup for merge test' '
git tag baseline
'
-test_expect_failure 'do not lose a/b-2/c/d in merge (resolve)' '
+test_expect_success 'do not lose a/b-2/c/d in merge (resolve)' '
git reset --hard &&
git checkout baseline^0 &&
git merge -s resolve master &&