From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Jun 2008 00:45:35 GMT
Subject: Re: core.autocrlf and merge conflict output
Message-ID: <7vy74xj7ww.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <g3miho$se5$1@ger.gmane.org>

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

> Apparently, the conflict information Git writes to the working copy
> during merge doesn't respect core.autocrlf,...

Is this an old news before 249c61a (merge-recursive: respect core.autocrlf
when writing out the result, 2008-06-09) happened?