X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=read-cache.c;h=16c4548a74561fdb8b744167b24af580234317e8;hb=6f53c3b21e3899716caccc2f88a1186ca7fa0f60;hp=1bbaf1cffba3058667787fc4a267b87e21a6cad3;hpb=c274db7057318835e975c26284f6f9d723b938f3;p=git.git

diff --git a/read-cache.c b/read-cache.c
index 1bbaf1cff..16c4548a7 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1606,9 +1606,8 @@ int read_index_unmerged(struct index_state *istate)
 		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",