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