diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2010-07-27 16:54:58 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-27 12:51:35 -0700 |
| commit | 2fd1ea14056cb630bbf99588b78d7d68f51907ce (patch) | |
| tree | 75e6d985413e87501bdde42fcf05f78547ddcce0 /t/t6035-merge-dir-to-symlink.sh | |
| parent | 253fb5f8897d988d93ce276f8147c2964da3eefb (diff) | |
| download | git-2fd1ea14056cb630bbf99588b78d7d68f51907ce.tar.gz git-2fd1ea14056cb630bbf99588b78d7d68f51907ce.tar.xz | |
t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
Various merge-recursive cases were fixed in "merge-recursive: Fix D/F
conflicts" by Elijah Newren. Some tests were changed from
test_expect_failure to test_expect_success, but one fell through the
cracks.
Change that test to use test_expect_success.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6035-merge-dir-to-symlink.sh')
| -rwxr-xr-x | t/t6035-merge-dir-to-symlink.sh | 2 |
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 f6972bed0..40c4f4a9b 100755 --- a/t/t6035-merge-dir-to-symlink.sh +++ b/t/t6035-merge-dir-to-symlink.sh @@ -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_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 checkout master^0 && git merge -s recursive baseline^0 && |