Disclaimer:

This website is a fork the original website: http://diffuse.sourceforge.net/. It has been forked because the source code of the program have been forked too in order to migrate from Python 2 to Python 3, and also to move away from SourceForge. If you are the authors of the original program, don't hesitate to contact me.

Get Diffuse today...

Discover why Diffuse is the best solution for you

Download
Version 0.6.0
Download

Diffuse is a small and simple text merge tool written in Python. With Diffuse, you can easily merge, edit, and review changes to your code. Diffuse is free software.

Quick Start

Compare a Set of Files

$ diffuse file1 file2 file3

Review Local Changes or Fix Merge Conflicts

$ diffuse -m

Compare Specific Revisions

$ diffuse -r rev1 -r rev2 file

Inspect a Revision

$ diffuse -c rev