Re: [PATCH] t3032 - make compatible with systems using \r\n as a line ending

2013-07-18 Thread Mark Levedahl
On 07/18/2013 03:19 PM, Ramsay Jones wrote: Jonathan Nieder wrote: 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

Re: [PATCH] t3032 - make compatible with systems using \r\n as a line ending

2013-07-18 Thread Ramsay Jones
Jonathan Nieder wrote: > 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

Re: [PATCH] t3032 - make compatible with systems using \r\n as a line ending

2013-07-17 Thread Junio C Hamano
Mark Levedahl writes: > Subtests 6, 7, and 9 rely test that merge-recursive correctly > ignores whitespace when so directed. These tests create and test for > lines ending in \r\n, but as this is a valid line separator on Windows, > convert such lines in the output to avoid confusion by line-orie

Re: [PATCH] t3032 - make compatible with systems using \r\n as a line ending

2013-07-16 Thread Mark Levedahl
On 07/16/2013 02:59 PM, Jonathan Nieder wrote: 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 bein

Re: [PATCH] t3032 - make compatible with systems using \r\n as a line ending

2013-07-16 Thread Jonathan Nieder
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-