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

Johannes Schindelin [off-list ref] 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.