AutoHotkey Community
It is currently May 27th, 2012, 2:13 am

View unanswered posts | View active topics


Board index » General » Utilities

All times are UTC [ DST ]



Post new topic Reply to topic  Page 1 of 1
  [ 3 posts ] 
  Print view | E-mail friend Previous topic | Next topic 
Author Message
majkinetor
PostPosted: February 3rd, 2010, 1:30 pm 
Offline

Joined: May 24th, 2006, 2:49 pm
Posts: 4511
Location: Belgrade
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

_________________
Image


Report this post
Top
 Profile  
Reply with quote  
derRaphael
 Post subject:
PostPosted: February 3rd, 2010, 5:20 pm 
Offline

Joined: November 23rd, 2007, 10:23 am
Posts: 841
Location: ~/.
winmerge is also compatible with tortoise versioning clients for windows :)

_________________
Image
    All scripts, unless otherwise noted, are hereby released under CC-BY


Report this post
Top
 Profile  
Reply with quote  
PhiLho
 Post subject:
PostPosted: February 3rd, 2010, 6:53 pm 
Offline

Joined: December 27th, 2005, 1:46 pm
Posts: 6837
Location: France (near Paris)
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...

_________________
Image vPhiLho := RegExReplace("Philippe Lhoste", "^(\w{3})\w*\s+\b(\w{3})\w*$", "$1$2")


Report this post
Top
 Profile  
Reply with quote  
Display posts from previous:  Sort by  
Post new topic Reply to topic  Page 1 of 1
  [ 3 posts ] 

Board index » General » Utilities

All times are UTC [ DST ]

Who is online

Users browsing this forum: No registered users and 2 guests

You can post new topics in this forum
You can reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot post attachments in this forum

Search for:
Powered by phpBB® Forum Software © phpBB Group