brodie/pygit2 — pull request #1 by belak (2014-11-20 19:21:32+00:00)
Title: Add Index.conflicts()

This adds an initial version of Index.conflicts() which returns all the conflicts from the libgit2 conflict iterator.