From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 01 Aug 2016 18:32:20 GMT
Subject: Re: [PATCH v5 16/16] merge-recursive: flush output buffer even when erroring out
Message-ID: <xmqqtwf4jq6j.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <alpine.DEB.2.20.1608011141380.149069@virtualbox>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

>> This is of course a good change, but we need to assume that no
>> further output is made from the remainder of the function for the
>> change in the next hunk to remove the existing flush to be correct.
> ...
> But you made me realize that I cannot simply *move* the flush_output()
> call here, in case that code in between will eventually add output.

Yup, that removal of the original one was the only thing I was
pointing out.