diff options
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index ad3e9a04fe..f4a9aa97a4 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1791,16 +1791,8 @@ int twoway_merge(const struct cache_entry * const *src, /* 20 or 21 */ return merged_entry(newtree, current, o); } - else { - /* all other failures */ - if (oldtree) - return o->gently ? -1 : reject_merge(oldtree, o); - if (current) - return o->gently ? -1 : reject_merge(current, o); - if (newtree) - return o->gently ? -1 : reject_merge(newtree, o); - return -1; - } + else + return o->gently ? -1 : reject_merge(current, o); } else if (newtree) { if (oldtree && !o->initial_checkout) { |