git_conflict 0.1.0

A git conflict manager library
Documentation