[XXX] Adds support for three-way merging multi-line String attributes