WinMerge is a Win32 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 in-line word diff visualisation.

http://winmerge.sourceforge.net/

Unicode support

WinMerge 2.2 is distributed with ANSI executable (WinMerge.exe) for Windows 95/98/ME and Unicode executable (WinMergeU.exe) for Windows NT /200/XP. Unicode executable supports UCS-2 and UTF-8 files and filenames.

It is unfortunate that two executable files are needed. But there is no currently way to get only one executable working. MS Unicode layer does not help WinMerge since WinMerge needs to be comparing files in different codepages.

Archive support

WinMerge 2.2 can open and save several archivetypes. Archive support requires installing 7-zip. Refer to Read Me.rtf file for info about compatible 7-zip version. 7-zip can be downloaded from 7-zip.org.

Shell integration

WinMerge 2.2 can be integrated into Windows Shell. Shell integration adds "Winmerge" menuitem to Windows Explorer's context menu for easy and fast comparing files and directories.

Selecting filter from commandline

New -f commandline switch allows selecting used filter or mask for files.

Project files

WinMerge can read paths to open from project files. Project files are simple XML files storing one or two paths, and also possibly choice of which filter to use and whether to include subfolders.

Generating patches

GNU/diffutils compatible patch files can be created from two files. Several formats and compare options are supported.

Plugins

Plugins are now supported to preprocess files before actual compare or to extend editor functionality. Plugins can be programmed using several languages supporting COM. Example plugins are included.

Improved directory compare

Many new features and improvements:

• More columns added (e.g. file sizes and attributes), shown columns can be selected and reordered.
  
• Filtered items have now own category (Skipped) and icons. Filtered items can be set to hidden/visible from View-menu.
  
• Floating statusbar during compare process, compare can be stopped and files/dirs compared so far are shown.
  
• Newer file/directory is indicated with asterisk (*) in date field.
  
• One or both directories can be set read-only, preventing accidental overwriting.
  
• Selected items count is shown in statusbar.

Improved file compare

Many new features and improvements:

• Rewritten undo/redo code.
  
• Fixed "Ignore blank lines" feature.
  
• Enchanged EOL handling (files can contain different EOL styles in one file).
  
• Linenumber, current column and char, line length and char count shown in statusbar.
  
• One ot both files can be set read-only to prevent accidental edits.
  
• Copy difference to left/right and advance to next makes merging faster.
  
• Diff pane to show current difference in two vertical panes.
  
• Highlight word differences in lines.
  
• Merge-mode (or 1.7 mode) to navigate and merge differences easier and faster.
  
• Goto -dialog for moving fast to certain line or difference.
  
• Location pane showing overall picture from files and allowing moving to location by double-clicking.
  
• Moved lines detection. Moved lines can be shown with different color in file area and location pane.
  
• More color options. Text color, missing line colors and moved line colors can be configured.

Для корректного функционирования плагинов необходим установленный WSH. Брать можно здесь:

Windows Script 5.6 for Windows 2000 and XP
http://www.microsoft.com/downloads/details.aspx?FamilyId=C717D943-7E4B-4622-86EB-95A22B832CAA&displaylang=en

Windows Script 5.6 for Windows 98, Windows Millennium Edition, and Windows NT 4.0
http://www.microsoft.com/downloads/details.aspx?FamilyId=0A8A18F6-249C-4A72-BFCF-FC6AF26DC390&displaylang=en