merge-recursive: adjust to loosened "working file clobbered" check

diff --git a/blob.h b/blob.h
index 4afad0f067e1979d7ccc4778e254cce6962ad136..ea5d9e9f8b63be2c7048d19ee53feb06b0795c80 100644 (file)
--- a/blob.h
+++ b/blob.h
@@ -9,7 +9,9 @@ struct blob {
        struct object object;
 };
 
-struct blob *lookup_blob(unsigned char *sha1);
+struct blob *lookup_blob(const unsigned char *sha1);
+
+int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size);
 
 int parse_blob(struct blob *item);