Does anyone know of an Open Source three-way merge implementation in JavaScript or PHP? I want to merge plain text files without the need to rely on any server side binaries.
I found a few solutions for creating diffs, but no merge implementations.
Synchrotron looks good. E.g. see the demo of three-way merge and conflict-handling.