diff options
Diffstat (limited to 'read-tree.c')
| -rw-r--r-- | read-tree.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/read-tree.c b/read-tree.c index bb50a800d..da0fcf035 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. */ |