compat / sha1-chunked.hon commit merge-recursive: rename conflict_rename_*() family of functions (8ebe7b0)
   1
   2int git_SHA1_Update_Chunked(platform_SHA_CTX *c, const void *data, size_t len);