X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=read-tree.c;h=be29b3fe11a370e53d3dce6a43dfccdc0e22ae2c;hb=69f0d91e49dbf3c3942bae125c07ad17f6027f83;hp=f39fe5ca653db7a4972cf99e790991c3d88495d0;hpb=70e1cca3886b2efac5bcd42065bde45395dd92c7;p=git.git

diff --git a/read-tree.c b/read-tree.c
index f39fe5ca..be29b3fe 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.
 		 */
@@ -704,7 +706,7 @@ static int read_cache_unmerged(void)
 	return deleted;
 }
 
-static const char read_tree_usage[] = "git-read-tree (<sha> | -m [-u | -i] <sha1> [<sha2> [<sha3>]])";
+static const char read_tree_usage[] = "git-read-tree (<sha> | -m [--aggressive] [-u | -i] <sha1> [<sha2> [<sha3>]])";
 
 static struct cache_file cache_file;