DiffMerge Description
DiffMerge allows you to visually compare and merge files from Windows, OS X, and Linux. The differences between two files are visually displayed. Includes intra-line highlighting, and full editing support. Graphically displays the changes between 3 files. Allows automatic merging, when it is safe to do so. Full control over editing the resulting files. This allows you to compare two folders side-by-side. It will show which files are only in one or both of the files. To instantly diff the files, right-click on any two files within Windows Explorer. Rulesets allow for customized behavior and appearance. Identical feature set for Windows, OS X and Linux. Graphically displays the differences between two files. Full editing support and intra-line highlighting. DiffMerge, a UNICODE-based program, can import files in a wide variety of character encodings.