contrib/completion: add smerge to the mergetool completion candidates

diff --git a/http-backend.c b/http-backend.c
index 9e894f197f91ee3565b0f3c618fdb4042e2f229f..29e68e38b5d5466126608642a96b9640aca44272 100644 (file)
--- a/http-backend.c
+++ b/http-backend.c
@@ -486,6 +486,8 @@ static void run_service(const char **argv, int buffer_input)
        if (buffer_input || gzipped_request || req_len >= 0)
                cld.in = -1;
        cld.git_cmd = 1;
+       cld.clean_on_exit = 1;
+       cld.wait_after_clean = 1;
        if (start_command(&cld))
                exit(1);