Merge pull request #3847 from libgit2/ethomson/read_index_conflicts Include conflicts in `git_index_read_index`
2016-06-30T10:20:32