diff options
Diffstat (limited to 'resolve-undo.h')
| -rw-r--r-- | resolve-undo.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/resolve-undo.h b/resolve-undo.h index 46306455ed..2b3f0f901e 100644 --- a/resolve-undo.h +++ b/resolve-undo.h @@ -1,17 +1,19 @@ #ifndef RESOLVE_UNDO_H #define RESOLVE_UNDO_H +#include "cache.h" + struct resolve_undo_info { unsigned int mode[3]; - unsigned char sha1[3][20]; + struct object_id oid[3]; }; -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(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 struct pathspec *); -extern void unmerge_marked_index(struct index_state *); +void record_resolve_undo(struct index_state *, struct cache_entry *); +void resolve_undo_write(struct strbuf *, struct string_list *); +struct string_list *resolve_undo_read(const char *, unsigned long); +void resolve_undo_clear_index(struct index_state *); +int unmerge_index_entry_at(struct index_state *, int); +void unmerge_index(struct index_state *, const struct pathspec *); +void unmerge_marked_index(struct index_state *); #endif |