Revert "Allow branch.*.merge to talk about remote tracking branches."

diff --git a/mozilla-sha1/sha1.h b/mozilla-sha1/sha1.h
index f5decbf43b259232d3ec4a665712df61f946a7f5..5d82afa3bdd21a2855c569a73cf3277b5c6a41bc 100644 (file)
--- a/mozilla-sha1/sha1.h
+++ b/mozilla-sha1/sha1.h
@@ -41,5 +41,5 @@ typedef struct {
 } SHA_CTX;
 
 void SHA1_Init(SHA_CTX *ctx);
-void SHA1_Update(SHA_CTX *ctx, void *dataIn, int len);
+void SHA1_Update(SHA_CTX *ctx, const void *dataIn, int len);
 void SHA1_Final(unsigned char hashout[20], SHA_CTX *ctx);