WinMerge is a tool for visual difference display and merging, for both files and directories. WinMerge has Unicode support, Flexible syntax coloring editor, and Windows Shell integration. Regexp filtering for filenames and lines. Side-by-side line difference and highlights differences inside lines. A file map shows the overall file differences in a location pane. The user interface is translated into several languages.
Version 2.6 includes new icons and splash screen, simpler and auto-closing folder compare progress bar, GUI for bookmarks, better character-level difference indication in file compare, and merge difference, which has cursor inside it (no need to select difference first).