From: Dennis Kaarsemaker <dennis@kaarsemaker.net>
Date: Mon, 29 Aug 2016 09:51:33 GMT
Subject: Re: [PATCH 20/22] sequencer: remember do_recursive_merge()'s return value
Message-ID: <1472464293.4265.28.camel@kaarsemaker.net>
In-Reply-To: <1f79d41e3417a0b1f0cffccc40e97f1a2c5ef987.1472457609.git.johannes.schindelin@gmx.de>

On ma, 2016-08-29 at 10:06 +0200, Johannes Schindelin wrote:

> The return value of do_recursive_merge() may be positive (indicating merge
> conflicts), se let's OR later error conditions so as not to overwrite them
> with 0.

s/se/so/?

D.