Introduce failing test for conflict filtering in index
Ensure filters (i.e. CRLF) are applied when checking out conflict content
Don't copy buffer in checkout unless needed
Merge pull request #2616 from ethomson/index_crlf

Apply filters when writing index