README.md

Diffuse documentation

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.

• Quick Start
• Users
• Translators
• Developers
  • Developers setup
  • Release process

Installation

Using Flatpak

flatpak install io.github.mightycreak.Diffuse

Flatpak is probably the easiest way to install Diffuse on any distribution and get the latest and greatest as quickly as possible. The Flatpak package is hosted on Flathub.

Note: If the Flathub repository is not installed yet, please follow these instructions.

Using the distribution package manager

The Diffuse package statuses for every distributions can been seen on repology.

Huge thanks to @bongochong for maintaining the Diffuse package on Fedora.

Integrate with Git

Diffuse is compatible with git difftool command-line. To use Diffuse as Git diff tool, run:

git config --global diff.tool diffuse

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