git_conflict 0.1.1

A git conflict manager library
Documentation