From: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue, 16 Jul 2013 18:59:33 GMT
Subject: Re: [PATCH] t3032 - make compatible with systems using \r\n as a line ending
Message-ID: <20130716185933.GO14690@google.com>
In-Reply-To: <1374000592-31845-1-git-send-email-mlevedahl@gmail.com>

Mark Levedahl wrote:

> Subtests 6, 7, and 9 rely test that merge-recursive correctly
> ignores whitespace when so directed. Change the particular whitespace
> sequences to be ones that are not known line endings so the whitespace
> is not changed when being extracted by line oriented grep.

merge-recursive needs to be able to deal with \r at EOL, too, so if at
all possible I would prefer to see the test fixed to pass on Cygwin
some other way.

Thanks.