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

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 by line

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

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

Mark Levedahl mleved...@gmail.com 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

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

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. Signed-off-by: Mark Levedahl

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

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.

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

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

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

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-oriented grep. Signed-off-by: Mark

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

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-oriented grep. Signed-off-by: Mark