Skip to content

Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.

License

Notifications You must be signed in to change notification settings

yakushabb/diffuse

This branch is 22 commits behind MightyCreak/diffuse:main.

Folders and files

NameName
Last commit message
Last commit date

Latest commit

b104057 · Apr 1, 2024
Jan 7, 2024
Jan 22, 2023
Nov 16, 2021
Apr 1, 2024
Jan 7, 2024
Jan 14, 2024
Jan 7, 2024
Oct 24, 2022
Jan 13, 2024
Jan 13, 2024
Nov 23, 2021
Nov 25, 2021
Apr 7, 2023
Oct 23, 2022
Apr 7, 2023
Jun 20, 2020
Jan 14, 2024
Nov 13, 2021
Apr 16, 2023
Apr 3, 2023
Jan 7, 2024
Jan 13, 2024
Nov 18, 2021
Apr 16, 2023
Apr 3, 2023
Apr 3, 2023

Repository files navigation

Diffuse

Download on Flathub

CI status Packaging status

Diffuse is a graphical tool for merging and comparing text files. Diffuse is able to compare an arbitrary number of files side-by-side and gives users the ability to manually adjust line matching and directly edit files. Diffuse can also retrieve revisions of files from several VCSs for comparison and merging.

Some key features of Diffuse:

  • 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
  • Supports several VCS: Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS and Subversion
  • Unicode support
  • Unlimited undo
  • Easy keyboard navigation

Documentation

For a more detailed documentation for users, translators and developers, see the documentation.

Contact

Discuss with us on Matrix at #diffuse:matrix.org.

Licenses

Diffuse is under the GPLv2.

The file io.github.mightycreak.Diffuse.appdata.xml.in is licensed under the FSF-AP license.

Copyright (C) 2006-2019 Derrick Moser derrick_moser@yahoo.com
Copyright (C) 2015-2023 Romain Failliot romain.failliot@foolstep.com

Icon made by @jimmac.

This repository is a fork of the original project on SourceForge, which doesn't seem to be maintained anymore: https://sourceforge.net/projects/diffuse/.

About

Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.

Resources

License

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Languages

  • Python 70.9%
  • Roff 24.9%
  • Inno Setup 1.5%
  • Shell 0.8%
  • Meson 0.8%
  • XSLT 0.7%
  • Other 0.4%