A three-way merge for XML documents