Commit 0e0108f73f83c7cedeaafd480fdcfe3cd6b69d1f

Edward Thomson 2013-05-17T15:59:57

introduce git_conflict_iterator