Just reminding that the difflib3.php (i think thats the file) from phpwiki.sf.net (latest version) does indeed have an implemention of merging.
__________________________________ Do you Yahoo!? Free Pop-Up Blocker - Get it now http://companion.yahoo.com/