From: Steffen Prohaska <prohaska@zib.de>
Date: Sun, 11 May 2008 19:08:13 GMT
Subject: Re: [PATCH] mergetool: Make ECMerge use the settings as specified by the user in the GUI
Message-ID: <54B4FE81-30F2-4B4B-BE47-91661EF9745F@zib.de>
In-Reply-To: <7vy76g4uis.fsf@gitster.siamese.dyndns.org>


On May 11, 2008, at 7:31 PM, Junio C Hamano wrote:

>> I tested the change and propose to take the patch.  I needed,
>> however, to remove dos line endings from the patch before it
>> applied cleanly.
>
> Thanks, I did not have that "apply" problem.

Indeed, it is Mac OS X's Mail.app that exports mails with the
wrong line endings.  I did not recognize this before, so I guess
something changed with OS X 10.5, which I installed recently.

	Steffen