Diff and Merge

Ellié Computing Merge

Ellié Computing Merge (ECMerge) is a rich differentiation/comparison and merge tool. It supports side by side, 2-way/3-way. It allows you to compare and merge text files, images, folders, archives and FTP/S sites. ECMerge is multi-platform and works on Windows, Linux and Solaris 10. It generates reports as unix patches, HTML, XML. It exists as a comma ...

DiffVue - diff utility

DiffVue is a diff tool, aka diff utility software for Windows. It is also a merge utility. DiffVue can not only compare folders and files but also compare ftp site's files, displaying differences visually not only the folder contents but also file contents. You can delete, copy, rename file(s) and folder(s) and undo the previous file operations. U ...

GNU diff and patch

CSDiff - advanced graphical diff for Windows

tkxcd - a free GUI diff/merge front-end

PRCS Merge

AIDE and HtmlDiff

Idem - folder mirroring tool , file synchronization

Idem automates file synchronization and data replication. At regular time interval, checks a list of source folders and updates target folders with new or modified sub-folders and files. It distributes and secures critical data duplicating it from a computer location to another. Used to create a mirror for disaster recovery or to backup files and syn ...

CS-ExcelDiff

ComponentSoftware ExcelDiff (CS-ExcelDiff) is an advanced Excel document comparison tool for Microsoft Windows which analyzes & presents differences in Excel documents containing either single or multiple sheets.

Guiffy 6.0 diff/merge

Guiffy is the advanced cross-platform compare/merge. 3-way smart, "SureMerge", interface. Inline diff highlighting. And, a command line interface for CM/SCM integrations -- Works with CVS, Perforce, SOS, StarTeam and many others. Guiffy also includes integrated Folder/FileTree Compare and Synchronization. Plus, a complete API package is included. ...

WinMerge - Free (GNU)

Features: Visual differencing of text files Diff a single file, or entire directories Merge differences Multi-level undo Directory recursion Integrated editor Rudimentary Visual SourceSafe integration Localizable interface via/ resource DLL

Araxis Merge

Visual file and folder comparison/merging application from Araxis. In-place editing and unique visual two and three-way* file/folder comparison and merging make Araxis Merge 2001 a compelling choice for software developers, product release managers, web designers and other professionals who work with text files, including ASCII, MBCS and Unicode files. ...

Guiffy - visual file/folder/tree compare/merge tool/com...

Guiffy is the quintessential cross-platform visual source file/folder, compare/merge, utility/component. Guiffy features 2-way interactive and 3-way smart, "SureMerge", interfaces. Merge interfaces support Editing during the merge and Undo. Guiffy comes with builtin UNICODE support(and over 100 File Encoding formats with multilingual fonts such as Bit ...

Beyond Compare

Beyond Compare is a utility for comparing things. Things like text files, folders, zip archives, and FTP sites. Use it to manage source code, keep folders in sync, compare program output, and validate CD copies. Beyond Compare can create a snapshot of a live directory structure, and compare it against the live copy at a later date. Beyond Compare he ...