“3-way merge” is another name for
Three-way merge
.