Hunter-
Just reminding that the difflib3.php (i think thats the file) from phpwiki.sf.net (latest version) does indeed have an implemention of merging.
It does, though it's not a particularly good one. The conflict markers are kind of annoying, and they get saved along with the regular text if you fail to remove them.
Regards,
Erik