Merge branch 'lf/sideband-returns-void' into maint

diff --git a/t/t4033-diff-patience.sh b/t/t4033-diff-patience.sh
index 5f0d0b164c328b06b4b46139e28a82b98ab8be1b..113304dc596034ff9bfaac65b2ff896b6a181dca 100755 (executable)
--- a/t/t4033-diff-patience.sh
+++ b/t/t4033-diff-patience.sh
@@ -5,7 +5,7 @@ test_description='patience diff algorithm'
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff-alternative.sh
 
-test_expect_failure '--ignore-space-at-eol with a single appended character' '
+test_expect_success '--ignore-space-at-eol with a single appended character' '
        printf "a\nb\nc\n" >pre &&
        printf "a\nbX\nc\n" >post &&
        test_must_fail git diff --no-index \