Often when do edit with multiple versions of files, you get confused with the changes made on these files. Diffuse is a simple and easy to use freeware text merge tool written in Python. With Diffuse, you can easily merge, edit, and review changes to your code. You can select two text files and then compare them for any difference and then merge them based on any change. While merging files it can do a two way merge or a three way merge depending upon the files.
The interface is pretty good and easy to use. You need to select the files for comparing and merging. The merge tool has option to copy context from files both ways and also the same for merging.
- Ability to compare and merge an arbitrary number of files side-by-side (n-way merges)
- Line matching can be manually corrected by the user
- Ability to directly edit files
- Syntax highlighting
- Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK support
- Support for UTF-8 encoded unicode
- Unlimited undo
- Easy keyboard navigation
Diffuse works on Windows, Mac and also Linux.
Related Reading: Merge HTML, CSS or Text Files with Net.FilesJoiner