test-lib: set $TRASH_DIRECTORY earlier

diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index 1f08a336878c21f67586d647571cea2ea85c3a73..cc5646836fce1aaaa01556450a9b017c7a853088 100755 (executable)
--- a/t/t3430-rebase-merges.sh
+++ b/t/t3430-rebase-merges.sh
@@ -396,7 +396,7 @@ test_expect_success 'with --autosquash and --exec' '
        grep "G: +G" actual
 '
 
-test_expect_failure '--continue after resolving conflicts after a merge' '
+test_expect_success '--continue after resolving conflicts after a merge' '
        git checkout -b already-has-g E &&
        git cherry-pick E..G &&
        test_commit H2 &&