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. Features include command line interface for easy invocation from other applications, configurable font, colors, and accelerators, support for text file encodings, ability to edit each of the three files, merge from changed files to resulting files, configurable filter for ignored files, saving configuration, automatic synchronization depending on file times and previous synchronization time, and inner-line change detection