3-way Merge

This is a comparison of three files at the top and the merged, editable output at the bottom.  The center file is the common ancestor of the two later versions.  Left and right changes are automatically included in the output.  Merge is a feature.