Re: core.autocrlf and merge conflict output

"Edward Z. Yang" [off-list ref] writes:

Junio C Hamano wrote:

quoted

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?