- https://en.wikipedia.org/wiki/Merge_(revision_control) - http://www.drdobbs.com/tools/three-way-merging-a-look-under-the-hood/240164902
