From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 23 Jun 2008 02:00:01 GMT
Subject: Re: core.autocrlf and merge conflict output
Message-ID: <alpine.DEB.1.00.0806230259140.6439@racer>
In-Reply-To: <g3mvbh$mmj$1@ger.gmane.org>

Hi,

On Sun, 22 Jun 2008, Edward Z. Yang wrote:

> Junio C Hamano wrote:
> > Is this an old news before 249c61a (merge-recursive: respect 
> > core.autocrlf when writing out the result, 2008-06-09) happened?
> 
> Apparently, yes. :o) Thus are the perils of working off a "downstream" 
> branch. I'll go bug the git/mingw/4msysgit.git maintainers to get this 
> change merged in. Thanks!

Funny.  And I thought 1.5.6 contained that patch...  Because 1.5.6 was 
merged by Steffen recently, and announced on both the msysgit list as well 
as this one.

Ciao,
Dscho