| View previous topic :: View next topic |
| Author |
Message |
majkinetor
Joined: 24 May 2006
Posts: 4511
Location: Belgrade
|
 Posted: Wed Feb 03, 2010 12:30 pm Post subject: WinMerge - Differencing and merging tool for Windows |
 |
|
| Quote: | 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.
Features
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
Link |
_________________
 |
|
| Back to top |
|
 |
derRaphael
Joined: 23 Nov 2007
Posts: 841
Location: ~/.
|
| Posted: Wed Feb 03, 2010 4:20 pm Post subject: |
|
|
winmerge is also compatible with tortoise versioning clients for windows 
_________________
All scripts, unless otherwise noted, are hereby released under CC-BY |
|
| Back to top |
|
|
PhiLho
Joined: 27 Dec 2005
Posts: 6836
Location: France (near Paris)
|
| Posted: Wed Feb 03, 2010 5:53 pm Post subject: |
|
|
I can't believe it hadn't yet its thread in this section! It is a classical Windows application (at least for developers).
I mentioned it in Superversion VCS thread, where I mention also P4Merge, which is an excellent free three-way merge tool.
I use WinMerge for file and folder comparisons, and P4Merge when I need to resolve conflicts in my Bazaar repositories...
_________________
 vPhiLho := RegExReplace("Philippe Lhoste", "^(\w{3})\w*\s+\b(\w{3})\w*$", "$1$2") |
|
| Back to top |
|
|
|
FAQ
Search
Memberlist
Register
Profile
Log in to check your private messages
Log in
