Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'nd/trace-with-env'
[gitweb.git]
/
resolve-undo.h
diff --git
a/resolve-undo.h
b/resolve-undo.h
index 46306455edddb94a554a7a2fcadf49a30861f599..87291904bd34e0e7f3a3601b6742f5345391824d 100644
(file)
--- 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 *);