WinMerge

WinMerge is a Windows tool for visual difference display and merging, for both files and directories. Unicode support. Flexible syntax coloring editor. Windows Shell integration. Regexp filtering. Side-by-side line diff and highlights diffs inside lines.

Features

• Visual differencing and merging of text files
• Flexible editor with syntax highlighting, line numbers and word-wrap
• Highlights differences inside lines
• Difference pane shows current difference in two vertical panes
• Location pane shows map of files compared
• Moved lines detection
• Compare folders in one level or recursive
• Can show folder compare results flat or in a tree-style view
• Regular Expression based file filters allow excluding and including items
• Compares binary files in folder compare as well as text files
• Shell Integration (supports 64-bit Windows versions)
• Archive file support using 7-Zip
• Fast compare using file sizes and dates
• Creates patch files (Normal-, Context- and Unified formats)

Links

• http://winmerge.org/
• http://sourceforge.net/projects/winmerge/