github/windows-msysgit — comment on commit 11a17fb67e7ec71324957c57e19543ea22a14f62
File:  line 0
By tclem:

So, why merge=union? Do you understand the consequences of that? Is that going to be an easier merge conflict to figure out?

Also, `eol=crlf` might be redundant as the default is to use the line endings of the platform (which is probably going to be windows `CRLF`). Can you open a *.sln file on Linux? If so, does it *have* to be `CRLF` even on linux? Because that is what you are specifying.