*.* merge=ours

*   -crlf
*.* -crlf