libgit2/libgit2 — pull request #1593 by ethomson (2013-05-17 21:12:52+00:00)
Title: introduce git_conflict_iterator

A lovely iterator for index conflicts that returns each side of the conflict (associated by name, of course).

This PR also adds `const`ness to the `git_index_conflict_get` function, in keeping with the new hotness of not allowing consumers to stomp all over the index entry memory. (Or at least politely suggests that they not.)