Active File Compare
Active File Compare is an advanced utility for the comparison and synchronization of any text files in visual mode, it reports the results of the comparison in two side-by-side windows on the screen, the differing lines being marked with special color icons. This utility is an excellent tool for comparing source code versions since it allows you to correct the source code and also supports syntax highlighting for the programming languages C++, C#, Java, Visual Basic, Delphi, Object Pascal, SQL, Perl, Assembler, Fortran, Foxpro etc. and for HTML, PHP, XML, INI and BAT files. You can also use it to manage the source code when several independent authors make changes. The algorithm of comparing is designed in such a way that it's always very accurate in finding differences both in small text files and in files with a large number of changes. Active File Compare has its own file manager consisting of two side-by-side windows.
Learn more
DiffMerge
DiffMerge is an application to visually compare and merge files on Windows, 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. Right-click on any two files in Windows Explorer to diff them immediately. Rulesets and options provide for customized appearance and behavior. Identical feature set on Windows, OS X, and Linux. Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing. DiffMerge is a UNICODE-based application and can import files in a wide range of character encodings.
Learn more
Diff Doc
Being able to compare documents easily, quickly and accurately is essential to your workflow. Now you can have it with 'Diff Doc' - your one-stop document comparison solution for file comparisons of all types. 'Diff Doc' can display the file differences in two possible views, 'All In One' or 'Side By Side.’ Both views have their advantages and switching between them is as easy as a mouse click. Lastly, there is a large selection of report types and options available for sharing the differences found with your peers. 'Diff Doc' was built to make file comparisons a quick and easy saving you time. You can even schedule/automate comparisons. Command line capability is fundamental to all of our software tools. We are always here to help you implement our software. Choose any portion of any document and compare it against any portion of the same or different document. Change the colors and formatting used to highlight the document changes.
Learn more
P4Merge
P4Merge tracks and compares the effects of past and pending work for branches and individual files. You can even use it to resolve conflicts (especially with Git). See the differences between file versions and easily resolve conflicts with P4Merge. Need to know what changed during a certain time frame? Folder Diff reveals history between any two points in time. Overlay two images to easily isolate pixel-level changes. Highlight and edit text file differences. Choose to include or ignore line endings/white spaces. Recognize line-ending conventions for Windows, Mac, and Unix. Display line numbers when comparing and merging files. See what code needs to be resolved in pending merges. Exclude files that are modified, unique, or unchanged. Organize modified assets in familiar file/folder hierarchy. Compare JPEG, GIF, TIFF, BMP, and other file formats. Overlap images or display side-by-side to view changes.
Learn more