DiffMerge is an application to visually compare and merge files for Windows, Mac OS X and Linux.
Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing.
Graphically shows the changes between 3 files. Allows automatic merging (when safe to do so) and full control over editing the resulting file.
Performs a side-by-side comparison of 2 folders, showing which files are only present in one file or the other, as well as file pairs which are identical or different.
Compares and synchronizes folder contents and various types of files.
It can create multiple documents based upon a template.
Free open source tool to split and merge pdf documents.
Extracts and compares field info from FileMaker layouts.
FmPro Script Diff compares, edits, searches and stores FileMaker scripts