summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
Diffstat (limited to 'resolve-undo.h')
-rw-r--r--resolve-undo.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/resolve-undo.h b/resolve-undo.h
index 46306455ed..87291904bd 100644
--- a/resolve-undo.h
+++ b/resolve-undo.h
@@ -3,7 +3,7 @@
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 *);