t5520: verify that `pull --rebase` shows the helpful advice when failing

diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index f9f3e5fd82e1b34d87993f750bd05e46e69bd82c..ac2cbee250887759b67898e4a2ce9d9c2708b7bc 100644 (file)
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -180,6 +180,7 @@ start_httpd() {
        if test $? -ne 0
        then
                trap 'die' EXIT
+               cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null
                test_skip_or_die $GIT_TEST_HTTPD "web server setup failed"
        fi
 }