Собственно выложу чем сам пользуюсь при сравнении кода ,безумно удобная вещь.
Araxis Merge Professional 2009 Build 3713
araxis.com
Самый быстрый способ сравнивать и объеденять файлы и папки. Без сомнения многие программисты знакомы с программами для сравнения файлов и папок - такими как WinDiff из пакета MS Visual Studio и т.п. Но ни один из них не может сравниться с Araxis Merge Professional. Эта программа позволяет сравнивать текстовые файлы в режимах линия-линия, слово-слово, символ-символ. Визуальное отображение разныцы в файлах а также визуальное объединение файлов самое удобное из всех аналогичных пакетов. Araxis Merge очень удобная программа.
Скачать программу можно от сюда:
http://www.araxis.com/download/merge2009_Win32_3713.exe
И сообственно русификатор с патчем, читаем инструкцию по установке в инсталяторе:
Только под
32 bit -
ТуТ
Только под
64 bit (Patch увы не могу протестировать) -
ТуТ
ссылки видимо на какой-то говнохостинг, потому убиты.
Compare It! 4
grigsoft.com/wincmp3.htm
Short overview of most important new features: v4 only! New viewers: compare binary and image files.
v4 only! Automatch rules: simplify comparison of structured files by using key fields.
New editing engine: most asked feature! Now true editing is possible within comparison panes, with full support of mouse and keyboard operations, clipboard, bookmarks, etc.
Syntax highlighting will be useful for all software/web developers. Built-in support for C++, Java, C#, Delphi, HTML + custom syntax files.
Word wrapping within editor pane - now you can easily see changes in long lines without having to scroll view.
MS Word, Excel, PDF, RTF files comparison. Details
Zip archives support: transparently compare file with its zipped version.
Converters: now you can use Compare It! to compare non-text files - if you can find a tool to convert your file format to text. Several ready to use converters you can find here
Moved Sections: Compare It! can detect and visualize moved sections, similar to what well-known WinDiff does.
WinMerge
winmerge.org
WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle.
WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application.
Features
In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible:
■General
■Supports Microsoft Windows 98/ME/2000/XP/2003/Vista/2008
■Handles Windows, Unix and Mac text file formats
■Unicode support
■Tabbed interface
■File Compare
■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
■Folder Compare
■Regular Expression based file filters allow excluding and including items
■Fast compare using file sizes and dates
■Compares one folder or includes all subfolders
■Can show folder compare results in a tree-style view
■Version Control
■Creates patch files (Normal-, Context- and Unified formats)
■Resolve conflict files
■Rudimentary Visual SourceSafe and Rational ClearCase integration
■Other
■Shell Integration (supports 64-bit Windows versions)
■Archive file support using 7-Zip
■Plugin support
■Localizable interface
■Online manual and installed HTML Help manual
Категории дневника
