introduce git_conflict_iterator
Merge pull request #1593 from ethomson/conflict_iterator

introduce git_conflict_iterator