A simple git repo that demonstrates two kinds of evil merges.