Assertion: way merging | /r/HasProperty | central innovation
Facets:
Source sentences:
text: Three-way merging is implemented by the ubiquitous diff3 program, and was the central innovation that allowed the switch from file-locking based revision control systems to merge-based revision control systems.