[Release] WinMerge - file differencing, merging tool v2.4.10

Discuss & post Update Pack addons here.
Post Reply
User avatar
Aserone
Posts: 306
Joined: Sat Mar 11, 2006 8:46 pm
Location: Opioid dependent head.

[Release] WinMerge - file differencing, merging tool v2.4.10

Post by Aserone » Wed Apr 12, 2006 12:14 pm

One of the best Open source differencing and merging tool I know of. I just love it! This addon is unicode only (NT,2000,XP).

I've added 7-zip 4.42 (dllbuild 0018) standalone operation plugin. This means that you don't have to have it installed to compare files inside compressed archives. But it won't intefere with any installed 7-zip version. It's just for convinience and that it lacks plugin support for alpha/beta versions of 7-zip (which I use). This way no need to downgrade.

WinMerge v2.4.10
LINK: Foxy_WinMerge_2.4.10_Addon
MD5: 0973CD8C1F60E4FAED59D49C6B51B4A3
SIZE: 974 KB
Builddate: 2006-08-12
Description: WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms.
Language: English (Only)
Version: 2.4.10
License: Open Source (GPL)
Release Date: 2006-08-10
Website: http://winmerge.sourceforge.net/
Installs to: "%programfiles%\Applications\WinMerge"
Shortcut: "StartMenu" --> "Applications\WinMerge.LNK"
Winmerge
WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.

Features:
  • Visual differencing and merging of text files
  • Flexible editor with syntax highlighting
  • Handles DOS, UNIX and MAC text file formats
  • Unicode support
  • Difference pane shows current difference in two vertical panes
  • Location pane shows map of files compared
  • Highlights differences inside lines
  • File filters in directory diff
  • Moved lines detection in file compare
  • Shell Integration
  • Rudimentary Visual SourceSafe and Rational ClearCase integration
  • Archive file support using 7-zip
  • Plugins
  • Localizable interface via resource DLL
[/color]
Image

Okay, this info is taken from Mrs Peel's layout (credit were it's due) for releasing addons. And if you have any objections for me implementing it to my addons please say so and I will remove it asap.

The reason for using this layout is that I think you "Mrs Peel" have sat a very good standard for addon info, and I love looking over your info before downloading.

Have fun all!

Edit: 2006/04/?? - RyanVM hosting (thanks!)
Edit: 2006/06/22 - Updated to stable v2.4.8
Edit: 2006/07/13 - Small update to 7-zip 4.42 dllbuild 0018 plugin
Edit: 2006/07/15 - RyanVM hosting (thanks!)
Edit: 2006/08/14 - Updated to stable v2.4.10
Last edited by Aserone on Mon Aug 14, 2006 4:37 am, edited 10 times in total.
//Aserone-Foxy | EULA: Everything I say/post is a lie and/or forwarded from swim.

User avatar
Zacam
Moderator
Posts: 615
Joined: Tue Sep 13, 2005 7:46 pm
Location: Portland, OR

Post by Zacam » Wed Apr 12, 2006 1:45 pm

This rocks. I love having unicode support in my apps, and lately WinDiff has become far to restrictive with what I want. IMO, WinMerge is a more superior and better laid out app than ExamDiff (though hopefully they'll make improvements to it and I do give cheer's to rappinhood for making it an addon), _this_ one is one I've been waiting for.

And yes, Mrs. Peel's work is definately standards setting. :) Fortunately, Siginet, Kel and Xable make it possible for people to be able to achive just as much as Mrs. Peel did (and I'm quite sure she's the helping type too!)

Kick @$$ for a first addon too, btw. A far cleaner job than my first one was.

User avatar
Mrs Peel
The Dominatrix Recoded
Posts: 1344
Joined: Tue Jan 17, 2006 2:02 am
Location: Aotearoa
Contact:

Post by Mrs Peel » Wed Apr 12, 2006 8:48 pm

Cool bananas! I was contemplating an addon pack for this and you just saved me the trouble hehe. :P

Hey do you guys realise that there is a very excellent tool in PSPad editor for comparing differences of text files. I use that feature heaps when I am tweaking files on my web sites so I can keep close track of changes to the original file. It's only good for text-type files but worth checking out all the same ;)

PS: Pretty post layout Aserone, nice to see you blokes embracing lilac as a colour :lol:

User avatar
Aserone
Posts: 306
Joined: Sat Mar 11, 2006 8:46 pm
Location: Opioid dependent head.

Post by Aserone » Fri Apr 14, 2006 8:08 am

heh, yeah I like lilac. Thanks for letting me use your layout!

Love you(r work that is) ;)

Edit: lol must have been high when posting. Sorry if I offended you.
//Aserone-Foxy | EULA: Everything I say/post is a lie and/or forwarded from swim.

User avatar
Aserone
Posts: 306
Joined: Sat Mar 11, 2006 8:46 pm
Location: Opioid dependent head.

Post by Aserone » Thu Jun 22, 2006 5:14 am

Maintenance update to v2.4.8

If anyone would like an addon for the 2.5.x line of beta versions I will release. They are pretty much complete to be released as 2.6 soon I think.
//Aserone-Foxy | EULA: Everything I say/post is a lie and/or forwarded from swim.

User avatar
Aserone
Posts: 306
Joined: Sat Mar 11, 2006 8:46 pm
Location: Opioid dependent head.

Post by Aserone » Mon Aug 14, 2006 4:41 am

Updated to v2.4.10.

Important changes after 2.4.8 stable release:
- 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
//Aserone-Foxy | EULA: Everything I say/post is a lie and/or forwarded from swim.

dziubek
Posts: 253
Joined: Sat Feb 19, 2005 1:03 pm
Location: Lodz

Post by dziubek » Sat Feb 03, 2007 4:55 am

WinMerge 2.6.4 - latest stable version
http://winmerge.org/2.6/changes.php



WinMerge 2.7.1.6 - (Experimental)

Latest Changes:

* New post-compare line filters for folder compare
* Optimization for word wrap code
* Bug fix: 2.7.1.5 forgets selected filter
* Bug fix: limiting to single file compare window now works more logically
* Bug fix: ANSI regular expressions didn't work
* Bulgarian, Catalan and Swedish translation updates

Post Reply