git_conflict 0.1.2

A git conflict manager library
Documentation