merge-recursive: flush output buffer even when erroring out

diff --git a/t/t6044-merge-unrelated-index-changes.sh b/t/t6044-merge-unrelated-index-changes.sh
index eed5d95c1343b4061c9e0b1e77cb0b6079773421..01023486c5363da00c9e381fcf1e7d5479c348ae 100755 (executable)
--- a/t/t6044-merge-unrelated-index-changes.sh
+++ b/t/t6044-merge-unrelated-index-changes.sh
@@ -20,7 +20,7 @@ test_description="merges with unrelated index changes"
 #   Commit E: renames a->subdir/a, adds subdir/e
 
 test_expect_success 'setup trivial merges' '
-       seq 1 10 >a &&
+       test_seq 1 10 >a &&
        git add a &&
        test_tick && git commit -m A &&
 
@@ -42,7 +42,7 @@ test_expect_success 'setup trivial merges' '
        test_tick && git commit -m C &&
 
        git checkout D &&
-       seq 2 10 >a &&
+       test_seq 2 10 >a &&
        echo d >d &&
        git add a d &&
        test_tick && git commit -m D &&
@@ -105,7 +105,7 @@ test_expect_success 'recursive' '
        test_must_fail git merge -s recursive C^0
 '
 
-test_expect_failure 'octopus, unrelated file touched' '
+test_expect_success 'octopus, unrelated file touched' '
        git reset --hard &&
        git checkout B^0 &&
 
@@ -114,7 +114,7 @@ test_expect_failure 'octopus, unrelated file touched' '
        test_must_fail git merge C^0 D^0
 '
 
-test_expect_failure 'octopus, related file removed' '
+test_expect_success 'octopus, related file removed' '
        git reset --hard &&
        git checkout B^0 &&
 
@@ -123,7 +123,7 @@ test_expect_failure 'octopus, related file removed' '
        test_must_fail git merge C^0 D^0
 '
 
-test_expect_failure 'octopus, related file modified' '
+test_expect_success 'octopus, related file modified' '
        git reset --hard &&
        git checkout B^0 &&