Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 84 additions & 50 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,45 +1,68 @@
<h1 align="center">
# Diffuse

<div align="center">
<img
src="./data/icons/hicolor/scalable/apps/io.github.mightycreak.Diffuse.svg"
alt="Diffuse"
alt="Diffuse Logo"
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For decorative images, the alt text should be empty.

width="192"
height="192"/><br/>
</h1>
height="192"/>
</div>

<p align="center" style="margin-top: 2em">
<div align="center">
<p><strong>A powerful graphical tool for merging and comparing text files</strong></p>

<a href="https://flathub.org/apps/details/io.github.mightycreak.Diffuse">
<img width="200" alt="Download on Flathub" src="https://flathub.org/assets/badges/flathub-badge-en.png"/>
</a>
</p>

<p align="center">
<a href="https://github.com/MightyCreak/diffuse/actions/workflows/ci.yml">
<img
src="https://github.com/MightyCreak/diffuse/actions/workflows/ci.yml/badge.svg"
alt="CI status"/>
</a>
<a href="https://repology.org/project/diffuse/versions">
<img src="https://repology.org/badge/tiny-repos/diffuse.svg" alt="Packaging status">
</a>
</p>

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][bzr], [CVS][cvs], [Darcs][darcs], [Git][git],
[Mercurial][hg], [Monotone][mtn], [RCS][rcs] and [Subversion][svn]
* Unicode support
* Unlimited undo
* Easy keyboard navigation

<p>
<a href="https://github.com/MightyCreak/diffuse/actions/workflows/ci.yml">
<img
src="https://github.com/MightyCreak/diffuse/actions/workflows/ci.yml/badge.svg"
alt="CI status"/>
</a>
<a href="https://repology.org/project/diffuse/versions">
<img src="https://repology.org/badge/tiny-repos/diffuse.svg" alt="Packaging status">
</a>
</p>
</div>

## Overview

Diffuse is a sophisticated graphical tool designed for merging and comparing text files with precision and ease. Whether you're reviewing code changes, merging configurations, or comparing documents, Diffuse provides an intuitive interface that handles complex file comparisons effortlessly.

Unlike traditional diff tools, Diffuse excels at comparing multiple files simultaneously and integrates seamlessly with popular version control systems, making it an essential tool for developers, system administrators, and anyone working with text files.
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original is better (fewer superlatives). This is more like marketing jargon.


## ✨ Key Features

**Multi-Way Comparisons**
- Compare and merge an arbitrary number of files side-by-side
- Support for n-way merges with intuitive visual representation

**Advanced Editing Capabilities**
- Direct file editing within the comparison view
- Manual line matching correction for precise control
- Unlimited undo functionality for confident editing

**Developer-Friendly**
- Comprehensive syntax highlighting for multiple programming languages
- Integration with major version control systems
- Easy keyboard navigation for efficient workflow

**Version Control Integration**
- Seamless support for multiple VCS platforms:
- [Git][git] - Modern distributed version control
- [Subversion][svn] - Centralized version control
- [Mercurial][hg] - Distributed version control
- [Bazaar][bzr] - Distributed version control
- [CVS][cvs] - Legacy version control
- [Darcs][darcs] - Advanced patch theory
- [Monotone][mtn] - Distributed version control
- [RCS][rcs] - Simple file versioning

**Internationalization**
- Full Unicode support for global compatibility
- Multi-language interface support
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, the original is better since there is no duplication and it is simple (easy to scan, no superlatives).


[bzr]: https://bazaar.canonical.com
[cvs]: https://cvs.nongnu.org
Expand All @@ -50,27 +73,38 @@ Some key features of Diffuse:
[rcs]: https://www.gnu.org/software/rcs/
[svn]: https://subversion.apache.org

## Documentation
## 📚 Documentation

Comprehensive documentation is available for users, translators, and developers in the [documentation](docs/) directory, covering:

- User guide and tutorials
- Developer API reference
- Translation guidelines
- Build and installation instructions
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you change the first sentence (it doesn't need it), don't put the list. If you want the list, remove the first sentence, and put links directly to the various parts of the list.


## 💬 Community & Support

Join our community discussions on Matrix: [#diffuse:matrix.org](https://matrix.to/#/#diffuse:matrix.org)

Whether you need help, want to contribute, or have suggestions for improvements, our community is here to help.
Comment thread
johnpetersa19 marked this conversation as resolved.
Outdated

For a more detailed documentation for users, translators and developers, see
the [documentation](docs/).
## 📄 License

## Contact
**Diffuse** is released under the [GPLv2](COPYING) license.

Discuss with us on Matrix at [#diffuse:matrix.org](https://matrix.to/#/#diffuse:matrix.org).
The AppData file [io.github.mightycreak.Diffuse.appdata.xml.in](data/io.github.mightycreak.Diffuse.appdata.xml.in) is licensed under the [FSF-AP](https://www.gnu.org/prep/maintain/html_node/License-Notices-for-Other-Files.html) license.

## Licenses
## 👥 Credits

Diffuse is under the [GPLv2](COPYING).
**Copyright & Maintainers:**
- Copyright (C) 2006-2019 Derrick Moser <derrick_moser@yahoo.com>
- Copyright (C) 2015-2023 Romain Failliot <romain.failliot@foolstep.com>

The file [io.github.mightycreak.Diffuse.appdata.xml.in](data/io.github.mightycreak.Diffuse.appdata.xml.in)
is licensed under the [FSF-AP](https://www.gnu.org/prep/maintain/html_node/License-Notices-for-Other-Files.html)
license.
**Design:**
- Icon designed by [@jimmac](https://github.com/jimmac)

Copyright (C) 2006-2019 Derrick Moser <derrick_moser@yahoo.com>
Copyright (C) 2015-2023 Romain Failliot <romain.failliot@foolstep.com>
## 🔗 Project History

Icon made by [@jimmac](https://github.com/jimmac).
This repository is a community-maintained fork of the original Diffuse project from SourceForge, which is no longer actively maintained. The original project can be found at: <https://sourceforge.net/projects/diffuse/>

This repository is a fork of the original project on SourceForge, which doesn't
seem to be maintained anymore: <https://sourceforge.net/projects/diffuse/>.
We've continued development to ensure Diffuse remains a reliable and modern tool for file comparison and merging.