From 7d7ee2ee0359232139b810190566a5e78d59a179 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 12 Aug 2014 11:25:34 -0700 Subject: SQUASH??? --- unpack-trees.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index 6bc0b280f5..5cbb467285 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1791,15 +1791,11 @@ 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 (newtree) - return o->gently ? -1 : reject_merge(newtree, o); - /* current is definitely exists here */ - return o->gently ? -1 : reject_merge(current, o); - } + /* all other failures */ + else if (o->gently) + return -1; + else + return reject_merge(current, o); } else if (newtree) { if (oldtree && !o->initial_checkout) { -- cgit v1.2.1