WINMERGE

'WinMerge' is a free software, open source tool for file comparison and merging text-like files. It is useful for determining what has changed between versions, and then merging changes between versions.
WinMerge runs on Microsoft Windows.

Contents

Features

See also

External links

Features

★ Visual differencing and merging of text files.

★ Flexible editor with syntax highlighting, line numbers and word-wrap.

★ Handles DOS, UNIX and MAC text file formats.

★ Unicode support.

★ Difference pane shows current difference in two vertical panes.

★ Location pane shows map of files compared.

★ Highlights differences inside lines in file compare.

★ Regular Expression based file filters in directory compare allow excluding and including items.

★ Moved lines detection in file compare.

★ Creates patch files.

★ Shell Integration (supports 64-bit Windows versions).

★ Rudimentary Visual SourceSafe and Rational ClearCase integration.

★ Archive file support using 7-Zip.

★ Plugins.

★ Localizable interface via resource DLL.

★ Online Manual and installed HTML Help manual.

See also

★ meld, KDiff3 - visualize differences very much like kompare, but on top of that allow the user to merge files (simply by picking one of a group of differing blocks of texts) and also edit details of the text. Kompare, on the other hand, is not meant for editing or merging.
:http://meld.sourceforge.net/
:http://kdiff3.sourceforge.net/

★ FileMerge presents file differences using a style very similar to Kompare.

★ Kompare

External links

★ Official website

★ WinMerge project page on SourceForge