diff options
Diffstat (limited to 'resolve-undo.h')
-rw-r--r-- | resolve-undo.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/resolve-undo.h b/resolve-undo.h index 46306455ed..fbe348efac 100644 --- a/resolve-undo.h +++ b/resolve-undo.h @@ -1,9 +1,11 @@ #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 *); |