Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxx> writes: > The test using the conflict_hunks helper function (test 9) fails > on cygwin, since sed (by default) throws away the CR from CRLF > line endings. This behaviour is undesirable, since the validation > code expects the CRLF line-ending to be present. In order to fix > the problem we pass the -b (--binary) option to sed, using the > SED_OPTIONS variable. We use the SED_STRIPS_CR prerequisite in the > conditional initialisation of SED_OPTIONS. > > Signed-off-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxx> > --- > > Note that this test does not fail on MinGW, but I don't > really know why, given commit ca02ad3... ahem ;-) Ahem, indeed. Why? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html