by matt
15. January 2009 23:12
I like WinMerge. It’s a nice, free file comparison program. Works very well indeed.
I have just 2 problems with it.
Firstly, it doesn’t support three-way merging, meaning I can’t use it for TortoiseSVN (that honour goes to SourceGear’s DiffMerge), but it’s great as a stand alone file diff-er.
Secondly, it comes with a poor set of defaults. Now, you can import and export your customised settings, so here’s a copy of mine. Main differences:
- No splash screen
- Consolas as the main font
- Automatically scroll to the first difference
- Multiple windows for file and folder comparison (why wouldn’t I want this set?)
- Moved block detection is enabled – this can get much better results in the diff, and the location bar on the left shows a link between the source and destination of the moved block
- Automatic rescan – detect new changes after each change to the file
- Disabled backup files
- And the biggie – changed colours for inline differences. By default, WinMerge checks for changes within a line, and displays those words that are different in a different colour. But, it displays the differences with a lighter colour than the rest of the line, de-emphasising the changes:
I’ve just swapped the colours, so the changed words are a darker shade, making it more obvious what’s changed:
Simple, but effective. And I’ve had to do this enough times, that I thought I’d output the settings so I’ve always got them to hand. If you’re interested, grab them from here.
a4f30c06-dd3d-4973-922c-b52aea3d43cd|0|.0
Tags: