From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 22 Jan 2016 16:58:30 GMT
Subject: Re: What's cooking in git.git (Jan 2016, #04; Wed, 20)
Message-ID: <alpine.DEB.2.20.1601221757290.2964@virtualbox>
In-Reply-To: <xmqqk2n33jxq.fsf@gitster.mtv.corp.google.com>

Hi Junio,

On Wed, 20 Jan 2016, Junio C Hamano wrote:

> * bb/merge-marker-crlf (2015-11-24) 1 commit
>  - merge-file: consider core.crlf when writing merge markers
> 
>  Write out merge markers using system end-of-line convention.
> 
>  Waiting for a re-roll to handle gitattributes.
>  ($gmane/281701)

For the record, it is $gmane/281700.

I will send out a replacement series shortly.

Ciao,
Dscho