Subject: t6023 broken under Mac OS

From: Torsten Bögershausen <[email-masked]>
Date: Fri, 1 Jan 2016 16:36:48 +0100

The (last) test case
'conflict markers contain CRLF when core.eol=crlf'

does not work as expected under Mac OS: "wc -l" is not portable and the line
test $(sed -n "/\.txt\r$/p" output.txt | wc -l) = 3
fails.

(The other problem is that the usage of "\r" in a sed expression is not portable
either.)

In other words: I don't have a solution at hand.