From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Jun 2008 01:54:24 GMT
Subject: Re: core.autocrlf and merge conflict output
Message-ID: <7vk5ggkjan.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <g3mvbh$mmj$1@ger.gmane.org>

"Edward Z. Yang" <edwardzyang@thewritingpot.com> writes:

> 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!

Did cherry-picking that particular commit locally fixes the issue for you?