git-merge: show usage if run without arguments

diff --git a/http.h b/http.h
index 9ca16acec25e3925c36bbade09b2cb7b4aa07842..6e12e416889503553ae502be31b2e9ed9e7dc4dd 100644 (file)
--- a/http.h
+++ b/http.h
@@ -22,6 +22,10 @@
 #define NO_CURL_EASY_DUPHANDLE
 #endif
 
+#if LIBCURL_VERSION_NUM < 0x070a03
+#define CURLE_HTTP_RETURNED_ERROR CURLE_HTTP_NOT_FOUND
+#endif
+
 struct slot_results
 {
        CURLcode curl_result;