ghedo/p5-Git-Raw — pull request #46 by jacquesg (2014-01-19 18:09:03+00:00)
Title: Index merge methods

This adds two methods that are required for merging, ```has_conflicts``` and ```conflict_cleanup```. This PR does not have the associated test cases, as this actually requires merges (PR #31).