A three-way merge is where an original file (ancestor or base) is merged with two other versions of the same file (children). The goal is to create a new file that is derived from the ancestor and contains modifications between ancestor and child 1, and modifications between ancestor and child 2 as well.
