libgit2/pygit2 — pull request #389 by carlosmn (2014-07-10 07:10:20+00:00)
Title: Move the index to cffi and add conflict information

I wanted to add information for conflicts, so I went and put it into python beforehand.