Adds test case for multi-line attribute merge
Adds integration of three-way text diffing into attribute merger