SmartSynchronize

SmartSynchronize is a multi-platform file and directory compare tool. It allows you to compare files or perform 3-way-merges, both with the ability to edit the file contents.

SmartSynchronize is optimized for comparing directory structures (for example, of software projects), and can keep them synchronized.

SmartSynchronize is not designed as a backup tool or for synchronizing with remote hosts, e.g. FTP. It does not know about platform-dependent file attributes like executable flags or permissions.