merge & sequencer: turn "Conflicts:" hint into a comment

diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index beb00be4b1593a058308d8897fed81a7cf1556d7..470ac54295e8640feb4d23a81c5dc8ce362857d0 100755 (executable)
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -153,7 +153,7 @@ test_expect_success 'used receive-pack service' '
 '
 
 test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
-       "$ROOT_PATH"/test_repo_clone master
+       "$ROOT_PATH"/test_repo_clone master             success
 
 test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper' '
        # create a dissimilarly-named remote ref so that git is unable to match the