Re: [PATCH 20/22] sequencer: remember do_recursive_merge()'s return value

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Aug 29, 2016, 11:09 UTC
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:

Show 7 quoted lines

> 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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.