A Fault-Tolerant Three-Way Merge for XML and HTML.
Tancred Lindholm, Torsten Rüger · 2005
Three-way merging is a technique that is used to reintegrate changes to a document when multiple independently modified copies have been made. Tools for three-way merge of ASCII text files exist in the form of the ubiquitous diff and patch tools, but these are of limited applicability when parts of the documents have been rearranged.