X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=resolve-undo.h;h=845876911db978c6262dacd9aa122ce9d55bf234;hb=19a6cd372a998df3079d870e02c064c5bb101841;hp=e4e5c1b1ad5b3fc7d5a2d516ab3ccccb3e88b993;hpb=459a18864fe5afaf1d7a7856906c921d6b756733;p=git.git

diff --git a/resolve-undo.h b/resolve-undo.h
index e4e5c1b1a..845876911 100644
--- a/resolve-undo.h
+++ b/resolve-undo.h
@@ -8,7 +8,7 @@ struct resolve_undo_info {
 
 extern void record_resolve_undo(struct index_state *, struct cache_entry *);
 extern void resolve_undo_write(struct strbuf *, struct string_list *);
-extern struct string_list *resolve_undo_read(void *, unsigned long);
+extern struct string_list *resolve_undo_read(const char *, unsigned long);
 extern void resolve_undo_clear_index(struct index_state *);
 extern int unmerge_index_entry_at(struct index_state *, int);
 extern void unmerge_index(struct index_state *, const char **);