diff options
Diffstat (limited to 'read-tree.c')
| -rw-r--r-- | read-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/read-tree.c b/read-tree.c index c25385d79f..7c830312c4 100644 --- a/read-tree.c +++ b/read-tree.c @@ -720,7 +720,7 @@ static int oneway_merge(struct cache_entry **src) if (!a) { invalidate_ce_path(old); - return 0; + return deleted_entry(old, NULL); } if (old && same(old, a)) { return keep_entry(old); |