WinMerge is a great freebie…for both code monkeys and regular users. It undergoes regular updating, as well. Let’s say you’re working on a project and then have to work on something else…you come back after some time and download the latest project or file version and want to see what’s changed…or, you want to sync versions. Same for code – you get the idea. You can see more with its features, below:
Features:
- General
- Supports Microsoft Windows 2000/XP/2003/Vista/2008/7/8/2012
- 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
Just a freebie which you might or might not need. Remember the usual disclaimer (I’m too lazy to copy-paste).
Learn more here (screenies, etc.): http://winmerge.org/about/
Have a fun weekend.