git-rerere: detect unparsable conflicts

diff --git a/cache.h b/cache.h
index 23f3b923350669001fffdc8c670825bdaefa7f3c..81b7e17de26ae33249c60b101f5718cb5c5e5699 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -694,8 +694,6 @@ extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, ch
 extern int server_supports(const char *feature);
 
 extern struct packed_git *parse_pack_index(unsigned char *sha1);
-extern struct packed_git *parse_pack_index_file(const unsigned char *sha1,
-                                               const char *idx_path);
 
 extern void prepare_packed_git(void);
 extern void reprepare_packed_git(void);