RAA - merge3

Merge3 is a new algorithm for ThreeWay merging of text/binary files. ThreeWay merging tries to merge two independently edited documents into a consistent one. It does so using the original file and the two edited, thus three way merging.

The merging algorithm is quite simple, and may be summarised as following the LineOfChange. Thus if one compares both files to the original and finds the common parts, one implicitly has found the added and deleted parts in both files. When all these parts are ordered, one walks along them, and wherever in the two edited files there is a change in the order, we take the bytes from there.