Merge branch 'dl/difftool-mergetool'

diff --git a/upload-pack.h b/upload-pack.h
index cab2178796a6406ed154c56bc9e06e54ba41c6f6..4bafe16a22c37d3eac65690cc6f1cc68476cf94c 100644 (file)
--- a/upload-pack.h
+++ b/upload-pack.h
@@ -13,11 +13,11 @@ void upload_pack(struct upload_pack_options *options);
 struct repository;
 struct argv_array;
 struct packet_reader;
-extern int upload_pack_v2(struct repository *r, struct argv_array *keys,
-                         struct packet_reader *request);
+int upload_pack_v2(struct repository *r, struct argv_array *keys,
+                  struct packet_reader *request);
 
 struct strbuf;
-extern int upload_pack_advertise(struct repository *r,
-                                struct strbuf *value);
+int upload_pack_advertise(struct repository *r,
+                         struct strbuf *value);
 
 #endif /* UPLOAD_PACK_H */