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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
