smileyborg/EvilMerge

A simple repo to illustrate two kinds of evil merges for a Stack Overflow question.