Hi, Suppose I have core.autocrlf set to true and and due to that a version controlled file in a working tree with CRLF line endings. If I modify such a file and then say "git diff", I get a patch with LF line endings. Also, if get a merge conflict with a file to which CRLF conversion is applied and run e.g. "git mergetool -t emerge", the temporary files representing stage2 and stage3 versions seem to have LF line endings. Is this intended behaviour? I'm using 1.6.1 on Cygwin. -- Hannu -- 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