libgit2/objective-git — pull request #274 by dannygreg (2013-10-11 21:48:23+00:00)
Title: [WIP] Conflicts in the index

:construction:

This PR will update our Index API to match `libgit2`'s in terms of conflict handling.