Merge (revision control)#Three-way merge

  1. REDIRECT Merge (version control)

{{R from move}}