Ramsay Jones writes:
> Hmm, I have never used a Mac, so I'm just guessing here, but
> you could try something like (obviously untested!):
>
> diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
> index 245359a..68b306f 100755
> --- a/t/t6023-merge-file.sh
>
On 02.01.16 20:35, Junio C Hamano wrote:
> Ramsay Jones writes:
>
>> Hmm, I have never used a Mac, so I'm just guessing here, but
>> you could try something like (obviously untested!):
>>
>> diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
>> index
On 01/01/16 17:49, Torsten Bögershausen wrote:
> On 2016-01-01 18.14, Ramsay Jones wrote:
>> Hi Torsten,
>>
>> On 01/01/16 15:36, Torsten Bögershausen wrote:
>>> The (last) test case
>>> 'conflict markers contain CRLF when core.eol=crlf'
>>>
>>> does not work as expected under Mac OS: "wc -l" is
On 2016-01-01 22.14, Ramsay Jones wrote:
>
>
> On 01/01/16 17:49, Torsten Bögershausen wrote:
>> On 2016-01-01 18.14, Ramsay Jones wrote:
>>> Hi Torsten,
>>>
>>> On 01/01/16 15:36, Torsten Bögershausen wrote:
The (last) test case
'conflict markers contain CRLF when core.eol=crlf'
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
Hi Torsten,
On 01/01/16 15:36, Torsten Bögershausen wrote:
> 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.
Hmm, I have
On 2016-01-01 18.14, Ramsay Jones wrote:
> Hi Torsten,
>
> On 01/01/16 15:36, Torsten Bögershausen wrote:
>> 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"
7 matches
Mail list logo