Diff/merge tool for files, folders, DBs, XML
Diff/merges local/FTP/SCC files/folders 3-way
Diff/merges local/FTP/SCC files/folders 2-way