merge-recursive: handle file mode changes

[git.git] / pack.h

diff --git a/pack.h b/pack.h
index cab4aa8381a83980558d8e26f0b3ce06746d8962..b31b37608d7f1901c74a20552770c306e633670c 100644 (file)
--- a/pack.h
+++ b/pack.h
@@ -59,6 +59,7 @@ extern char *write_idx_file(char *index_name, struct pack_idx_entry **objects, i
 
 extern int verify_pack(struct packed_git *, int);
 extern void fixup_pack_header_footer(int, unsigned char *, const char *, uint32_t);
+extern char *index_pack_lockfile(int fd);
 
 #define PH_ERROR_EOF           (-1)
 #define PH_ERROR_PACK_SIGNATURE        (-2)