some svn-merge tools