X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=read-tree.c;fp=read-tree.c;h=da0fcf035e97ce0d362237c73993e6bf4c4de4ff;hb=1142038098810a69e57d88554559e4e6116df177;hp=bb50a800d79dbfb7836b6cba1c62935d9a78577e;hpb=e1a0c8b1483b38d32d3870408e03a6c1b340aa15;p=git.git

diff --git a/read-tree.c b/read-tree.c
index bb50a800..da0fcf03 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.
 		 */