From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 30 Aug 2008 09:14:15 GMT
Subject: Re: [PATCH 01/12] xdl_fill_merge_buffer(): separate out a too deeply nested function
Message-ID: <alpine.DEB.1.00.0808301112420.24820@pacific.mpi-cbg.de.mpi-cbg.de>
In-Reply-To: <1220056963-2352-2-git-send-email-gitster@pobox.com>

Hi,

On Fri, 29 Aug 2008, Junio C Hamano wrote:

> This simply moves code around to make a separate function that prepares 
> a single conflicted hunk with markers into the buffer.

Apart from renaming "i1" to "i", inverting the order of the if clauses, 
and making it more obvious that the calculation of size without dest is 
correct, this is a straight forward refactoring.

Ciao,
Dscho