Merge pull request #2534 from libgit2/ntk/case_index_conflicts Failing test for case sensitive conflicts in the index