Subject: Re: [PATCH v2 19/25] sequencer: remember do_recursive_merge()'s return value

From: Junio C Hamano <[email-masked]>
Date: Wed, 05 Oct 2016 10:43:38 -0700

Johannes Schindelin <[email-masked]> 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.