KDiff3 is a file and directory diff and merge tool which compares and merges two or three text input files or directories, shows the differences line by line and character by character, provides an automatic merge-facility, has an editor...
kdiff3 is a file and directory diff and merge tool which compares and merges two or three text input files or directories, shows the differences line by line and character by character, provides an automatic mergefacility, has an editor for comfortable solving of mergeconflicts, provides networktransparency via kio, has options to highlight or hide changes in whitespace or comments, supports unicode, utf8 and other file encodings, prints differences, supports version control keyword and history merging.
Version and Source control Folder Comparison
Productivity Developer Tools File Management
Discontinued version-control-system hex-viewer diff file-compare folder-compare merging
WinMerge 2011 series is a fork of the original WinMerge application that compiles without ATL/MFC dependencies.
winmerge jp is a fork of original winmerge that incorporates many own features including 3-way compare, high dpi support and many more.
