Merge branch 'maint'

* maint:
  read-tree --aggressive: remove deleted entry from the working tree.

diff --combined read-tree.c
index f39fe5c,da0fcf0..c56b572
--- 1/read-tree.c
--- 2/read-tree.c
+++ b/read-tree.c
@@@ -404,7 -404,7 +404,7 @@@ static void verify_uptodate(struct cach
                return;
  
        if (!lstat(ce->name, &st)) {
 -              unsigned changed = ce_match_stat(ce, &st);
 +              unsigned changed = ce_match_stat(ce, &st, 1);
                if (!changed)
                        return;
                errno = 0;
@@@ -560,9 -560,11 +560,11 @@@ static int threeway_merge(struct cache_
                 */
                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.
                 */