Imported Upstream version 2.19.0

[platform/upstream/git.git] / resolve-undo.h

diff --git a/resolve-undo.h b/resolve-undo.h
index 4630645..fbe348e 100644 (file)
--- 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 *);