From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 05 Oct 2016 17:43:38 GMT
Subject: Re: [PATCH v2 19/25] sequencer: remember do_recursive_merge()'s return value
Message-ID: <xmqqmviipu7p.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <alpine.DEB.2.20.1610051348020.35196@virtualbox>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Actually, come to think of it, I will change the patch, as it is too
> confusing. What I want is to preserve a positive return value in case of
> merge conflicts, and that is exactly what I should do instead of playing
> games with the Boolean OR operator.

That would be good; that was exactly the confusion I felt that led
to my comments.