projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'maint'
[git.git]
/
read-tree.c
diff --git
a/read-tree.c
b/read-tree.c
index
f39fe5c
..
c56b572
100644
(file)
--- 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) ||
*/
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;
return 0;
-
+ }
/*
* Added in both, identically.
*/
/*
* Added in both, identically.
*/