X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=read-tree.c;h=c56b572d05266bb6eeae394184708d2075945d18;hb=2486927d2ec9cc05ed7589540d103382d3751c10;hp=f39fe5ca653db7a4972cf99e790991c3d88495d0;hpb=f0b0af1b04f558b684cae2a3b805ca4bab84d45f;p=git.git

diff --git a/read-tree.c b/read-tree.c
index f39fe5ca..c56b572d 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -560,9 +560,11 @@ static int threeway_merge(struct cache_entry **stages)
 		 */
 		if ((head_deleted && remote_deleted) ||
 		    (head_deleted && remote && remote_match) ||
-		    (remote_deleted && head && head_match))
+		    (remote_deleted && head && head_match)) {
+			if (index)
+				return deleted_entry(index, index);
 			return 0;
-
+		}
 		/*
 		 * Added in both, identically.
 		 */