Commit 26ab6284b20a3709adc7641a52250f72df9257aa

Vicent Martí 2013-05-24T03:30:35

Merge pull request #1593 from ethomson/conflict_iterator introduce git_conflict_iterator