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 either.) In other words: I don't have a solution at hand. -- 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