Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
l10n: fr.po fix grammar mistakes
[gitweb.git]
/
resolve-undo.c
diff --git
a/resolve-undo.c
b/resolve-undo.c
index 468a2eb92c6d72c519faf5c8203d3d41d520c12d..b40f3173d3fe5ef5c06c00ff8994060a9078669d 100644
(file)
--- a/
resolve-undo.c
+++ b/
resolve-undo.c
@@
-24,7
+24,7
@@
void record_resolve_undo(struct index_state *istate, struct cache_entry *ce)
if (!lost->util)
lost->util = xcalloc(1, sizeof(*ui));
ui = lost->util;
- hashcpy(ui->sha1[stage - 1], ce->
sha1
);
+ hashcpy(ui->sha1[stage - 1], ce->
oid.hash
);
ui->mode[stage - 1] = ce->ce_mode;
}