The state of the art in merge technology
codicesoftware.blogspot.com