libgit2/libgit2 — pull request #2607 by jacquesg (2014-10-10 11:25:55+00:00)
Title: Ensure filters (i.e. CRLF) are applied when checking out conflict content

Currently when we're writing out the content of a conflicted file via ```git_checkout_index```, we're bypassing the filter mechanisms.

On Windows (with ```core.autocrlf = true```), we end up with just line-feeds in the working directory, which in itself may cause more conflicts further down the line.