Hash : 0e0108f7 Author : Date : 2013-05-17T15:59:57
introduce git_conflict_iterator
https://libgit2.org/