diff options
Diffstat (limited to 'resolve-undo.h')
| -rw-r--r-- | resolve-undo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/resolve-undo.h b/resolve-undo.h index e4e5c1b1ad..845876911d 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 **); |