From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 29 Aug 2016 11:09:38 GMT
Subject: Re: [PATCH 20/22] sequencer: remember do_recursive_merge()'s return value
Message-ID: <alpine.DEB.2.20.1608291309280.129229@virtualbox>
In-Reply-To: <1472464293.4265.28.camel@kaarsemaker.net>

Hi Dennis,

On Mon, 29 Aug 2016, Dennis Kaarsemaker wrote:

> 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/?

Good eyes.

Fixed,
Dscho