three-way merge

  1. REDIRECT Merge (version control)#Three-way merge {{r to section}}