semantic-merge

A merging utility that is self-descriptive and makes sense