» WinMerge

Утилита WinMerge, предназначена для визуального сравнения текстовых документов в Windows на предмет изменений в них. Работает с DOS, UNIX и MAC форматами файлов, поддерживает Unicode. Найденные изменения подсвечиваются. Умеет интегрироваться в оболочку Винды, поддерживает расширение плагинами, которые можете скачать с сайта разработчика.

xdocdiff - плагин к WinMerge для сравнения word/excel и pdf файлов.

Последняя стабильная версия: 2.14.0 2013-02-03 Скачать
Experimental версия: 2.13.22 2013-01-14 Скачать

---

Программы аналогичного назначения:
Active File Compare
Araxis Merge
Beyond Compare
Compare++
Compare It!
Compare Suite
Diff Doc
DiffMerge
ExamDiff Pro
KDiff3
UltraCompare
Workshare DeltaView / Workshare Compare

WinMerge 2.4.0 Final

Цитата:

Latest Changes: View Less Changes
- Line-diff for all differences (enable/disable from menu View/View Line Differences)
- Compared paths shown in caption
- Highlight character difference in lines
- UI for project files (Open-dialog and File-menu)
- New (quick) compare method for directory compare (Options/compare)
- Copy lines with linenumbers from editor (Edit/Advanced)
- New options-dialog
- Own menus for directory and file compare
- Can open multiple file- and directory-compare windows
- Limit to single instance
- Allow selecting syntax highlight colors
- Show progressbar in directory compare statepane
- New plugin to show XML files
- Ability to compare big binary files and overall speed improvement for comparing big files
- Improvements to archive support
- Simple folder compare reports
- Improvement to Shell Extension for re-selecting first item

http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-Setup.exe?use_mirror=ovh

WinMerge 2.5.0.1 Experimental Build
Changes
http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.0.1-Setup.exe?use_mirror=surfnet

WinMerge 2.5.0.2
http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.0.2-Setup.exe?use_mirror=heanet

WinMerge 2.4.2 Stable

Цитата:

Changes:
- New plugin to compare MS Excel files
- translation updates
- manual updates
- bugfix: filtered files were compared
- bugfix: crash when saving filenames with different cases
- bugfix: allow opening archive files from folder compare
- bugfix: find string got cleared after rescanning files
- bugfix: canceling Visual SourceSafe checkout didn't work
- bugfix: Visual SourceSafe did hang sometimes (misdetected projectfile)
- feature: Ctrl+W closes active window
- feature: modern file selection dialog

http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-Setup.exe?use_mirror=voxel
http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-exe.zip?use_mirror=internap

WinMerge 2.5.0.3

Цитата:

- Highlighting line difference by character (uncheck Break on words -checkbox in Editor-options)
- Swap panes in file compare (View/Swap Panes)
- Bugfix: Created file filter didn't appear to dialog
- Bugfix: Crash when changing UI language
- Catalan translation update

_http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.0.3-Setup.exe

WinMerge 2.4.4
_http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.4-Setup.exe

WinMerge 2.4.4 Final

Цитата:

Changes:
- Line-diff for all differences (enable/disable from menu View/View Line Differences)
- Compared paths shown in caption
- Highlight character difference in lines
- UI for project files (Open-dialog and File-menu)
- New (quick) compare method for directory compare (Options/compare)
- Copy lines with linenumbers from editor (Edit/Advanced)
- New options-dialog
- Own menus for directory and file compare
- Can open multiple file- and directory-compare windows
- Limit to single instance
- Allow selecting syntax highlight colors
- Show progressbar in directory compare statepane
- New plugin to compare XML files
- New plugin to compare MS Word files
- Ability to compare big binary files and overall speed improvement
for comparing big files
- Improvements to archive support
- Simple folder compare reports
- Improvement to Shell Extension for re-selecting first item

WinMerge 2.5.0.4 Experimental Build
http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.0.4-exe.zip?use_mirror=heanet

WinMerge 2.5.0.5
_http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.0.5-Setup.exe

WinMerge 2.5.0.5 Experimental Build

Цитата:

Changes:
- New status icons in folder compare
- Find selected text with Ctrl+F3
- Improve options UI for line differences
- Update Open-dialog controls when dialog is activated
- Bug fix: copying unique binary file to other side set status to text file
- Bug fix: resource leak in ShellExtension
- Bug fix: save pane sizes and positions when they change
- This should fix problems with re-appearing panes
- Bug fix: allow quotes in Rational ClearCase checkout comment
- Bug fix: fix EOL bytes handling in quick compare

WinMerge 2.5.2.0
_http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.2.0-Setup.exe

WinMerge 2.5.2.0 Beta

Цитата:

Changes:
- new folder compare progress- and statistics- dialogs
- short filesize columns for folder compare
- improvements to Rational Clearcase support
- word wrap in file compare
- printing support in file compare
- character-level line differences
- options import and export
- Shift+F3, Ctrl+F3 and Shift+Ctrl+F3 shortcut keys for searching
- bugfix: fix for handling unknown encoding
- plugin bug fixes and updates
- translation updates

WinMerge 2.5.3.1 Experimental

Цитата:

Changes:
- New style for pane headers (location- and diff-pane)
- New style filename headers in file- and folder-compare
- Support Unicode filefilter files
- Open unique files (only in other side) to external editor
- Improve difference highlight in diffs
- Self-tests (for diff-engine)
- Allow merging difference when cursor is inside it (no need to select the difference first, just move cursor inside it)
- Manual in HTML help format (Copy WinMerge.chm to Docs -folder)
- Bugfix: whitespace handling for quick compare
- Translation update for Polish

http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.3.1-Setup.exe

WinMerge 2.5.3.2 Experimental
_http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.3.2-Setup.exe?download

WinMerge 2.5.3.2 Experimental

Цитата:

Changes:
- Simplified UI for Select (was Highlight) Line Difference
- Move 'Save Project' from Open-dialog to Folder/File compare mainmenu
- Rearrange language select dialog
- Many diffengine bugfixes
- Bug fix: did not close handles to folders selected using browse dialog
- Translation updates

WinMerge 2.4.6 (stable)
история изменений - _http://sourceforge.net/forum/forum.php?forum_id=546368
_http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.6-Setup.exe?download

WinMerge 2.5.3.3 Experimental
история изменений - _http://sourceforge.net/project/shownotes.php?group_id=13216&release_id=399133
_http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.3.3-Setup.exe?download

WinMerge 2.5.3.4 Experimental
история изменений - _http://sourceforge.net/project/shownotes.php?group_id=13216&release_id=400315
_http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.3.4-Setup.exe?download

WinMerge 2.5.3.5 Experimental
история изменений - _http://sourceforge.net/project/shownotes.php?group_id=13216&release_id=403818
_http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.3.5-Setup.exe?download

WinMerge 2.5.3.6 Experimental

Цитата:

Changes:
- added possiblity to create a patch from multiple files:
select files from folder compare and open patch generator-dialog (does not work for unique files or folders)
- path autocomplete option for open-dialog
- simple xml reports from folder compare
- beep after over three-second long folder compare
- bugfix: replace all didn't work
- bugfix: splash screen possible to localize again
- bugfix: scrollbars were sometimes disabled in file compare
- Swedish translation updated

http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.3.6-Setup.exe?use_mirror=surfnet
http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.3.6-exe.zip?use_mirror=surfnet

WinMerge 2.5.3.7
.http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.3.7-Setup.exe?download

WinMerge 2.5.4

Цитата:

- Add GUI for user to select filter folder
- bugfix: creating private filefilters failed
- bugfix: PHP/ASP Syntax Highlighting
- bugfix: folder compare progressdialog didn't always close properly
- manual updates
- translation updates

http://easynews.dl.sourceforge.net/sourceforge/winmerge/WinMerge-2.5.4-Setup.exe
http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.4-Setup.exe

WinMerge 2.4.8 stable

Цитата:

- bugfix: root folders weren't handled correctly in some cases
- bugfix: replace all didn't work
- bugfix: crash when there was binary data in text file
- bugfix: crash when updating location view (can be a reason for mysterious
crashes some users experience)
- bugfix: PHP/ASP Syntax Highlighting didn't work if begin of the file
was not visible
- bugfix: Open-dialog could hang when path editbox was empty and Browse-button
was selected
- bugfix: subfolder names weren't copied when Copy Pathnames was selected
- new ASP/NET file filter
- add '*.pm' and '*.plx' file extensions to Perl syntax highlighter
- translation updates

_http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.8-Setup.exe?download

WinMerge 2.5.5.3
http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.5.3-Setup.exe

WinMerge 2.5.5.6
http://prdownloads.sourceforge.net/winmerge/WinMerge-2.5.5.6-Setup.exe

WinMerge 2.4.10 Stable


Цитата:

- bugfix: crash when closing window with Ctrl+W
- bugfix: PgUp key moved file two screens up
- bugfix: last line in file filter file was not read
- bugfix: sometimes changes done outside WinMerge were not detected when folder compare was refreshed
- bugfix: crash when switching to empty file with F6-key
- bugfix: wrong cursor position after Find caused same text to be found again

Скачать (2.5 Мб.)

А как подружить сабж и VSS6 ?
А то вроде в доке как указано что должен поддерживать, но как...
Может кто подскажет поподробней?

WinMerge 2.6.0 - latest stable version

Hystory | скачать

WinMerge 2.6.6 - latest stable version
Изменения
Add Vista security attributes to manifest files
Скачать

WinMerge 2.7.3.6 Experimental
Скачать