diff --git a/read-cache.c b/read-cache.c
index a0adb272fdbbb73765f54bb65be0b0453450bf0d..d214abab163e30c0328eac0bd9a65749c271d173 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
len = strlen(ce->name);
size = cache_entry_size(len);
new_ce = xcalloc(1, size);
- hashcpy(new_ce->sha1, ce->sha1);
memcpy(new_ce->name, ce->name, len);
- new_ce->ce_flags = create_ce_flags(len, 0);
+ new_ce->ce_flags = create_ce_flags(len, 0) | CE_CONFLICTED;
new_ce->ce_mode = ce->ce_mode;
if (add_index_entry(istate, new_ce, 0))
return error("%s: cannot drop to stage #0",