merge-recursive: remove final remaining caller of merge_file_one()

diff --git a/notes-cache.h b/notes-cache.h
index 356f88fb3c63786348a85cc913502245dd526808..aeeee8409d4320644a1f618f5cd25b815be52f1c 100644 (file)
--- a/notes-cache.h
+++ b/notes-cache.h
@@ -12,9 +12,9 @@ void notes_cache_init(struct notes_cache *c, const char *name,
                     const char *validity);
 int notes_cache_write(struct notes_cache *c);
 
-char *notes_cache_get(struct notes_cache *c, unsigned char sha1[20], size_t
+char *notes_cache_get(struct notes_cache *c, struct object_id *oid, size_t
                      *outsize);
-int notes_cache_put(struct notes_cache *c, unsigned char sha1[20],
+int notes_cache_put(struct notes_cache *c, struct object_id *oid,
                    const char *data, size_t size);
 
 #endif /* NOTES_CACHE_H */