update to merge to allow comment based merges and the introduction of a resync tool that will resync the subvert database with the subversion logs.