Implement merging of rich text changes.
Style-aware undo for every flavor except CodeArea.

Closes #7.