Am 6/24/2010 22:44, schrieb Eyvind Bernhardsen: > There's no need to expand CRLFs when convert_to_working_tree() is called > to normalize text for a merge since the text will be converted back > immediately. Improves performance of merges with conflicting line > endings when core.eol=crlf or core.autocrlf=true. Pardon me, first you make a big deal about normalization for merges, only that you finally omit it? What am I missing? BTW, most of the new functions you introduced violate the style: they should have the opening brace on the next line. -- Hannes -- 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