From 970e1f57d2644e951e3723cea21cd9802e94d4d9 Mon Sep 17 00:00:00 2001 From: John Peter Sa <156824256+johnpetersa19@users.noreply.github.com> Date: Mon, 26 May 2025 11:25:08 -0300 Subject: [PATCH 1/3] Update README.md Update --- README.md | 134 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 84 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index 8ebc1c38..9e328733 100644 --- a/README.md +++ b/README.md @@ -1,45 +1,68 @@ -

+# Diffuse + +
Diffuse
-

+ height="192"/> + -

+

+

A powerful graphical tool for merging and comparing text files

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

+ + CI status + + + Packaging status + +

+
+ +## 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. + +## ✨ 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 [bzr]: https://bazaar.canonical.com [cvs]: https://cvs.nongnu.org @@ -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 + +## 💬 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. -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 +- Copyright (C) 2015-2023 Romain Failliot -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 -Copyright (C) 2015-2023 Romain Failliot +## 🔗 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: -This repository is a fork of the original project on SourceForge, which doesn't -seem to be maintained anymore: . +We've continued development to ensure Diffuse remains a reliable and modern tool for file comparison and merging. From 2a9e5e84a403709e3e33895d0eced9d0a85a1564 Mon Sep 17 00:00:00 2001 From: John Peter Sa <156824256+johnpetersa19@users.noreply.github.com> Date: Mon, 26 May 2025 11:39:26 -0300 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9e328733..0c06fe0f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@
Diffuse Logo
From c32389648c4cd6bee22d713d02960071eb5e7ff6 Mon Sep 17 00:00:00 2001 From: John Peter Sa <156824256+johnpetersa19@users.noreply.github.com> Date: Mon, 26 May 2025 11:56:47 -0300 Subject: [PATCH 3/3] Update README.md --- README.md | 132 ++++++++++++++++++++---------------------------------- 1 file changed, 49 insertions(+), 83 deletions(-) diff --git a/README.md b/README.md index 0c06fe0f..8ebc1c38 100644 --- a/README.md +++ b/README.md @@ -1,68 +1,45 @@ -# Diffuse - -
+

Diffuse -

+ height="192"/>
+ -
-

A powerful graphical tool for merging and comparing text files

- +

Download on Flathub - -

- - CI status - - - Packaging status - -

-
- -## 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. - -## ✨ 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 +

+ +

+ + 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][bzr], [CVS][cvs], [Darcs][darcs], [Git][git], + [Mercurial][hg], [Monotone][mtn], [RCS][rcs] and [Subversion][svn] +* Unicode support +* Unlimited undo +* Easy keyboard navigation [bzr]: https://bazaar.canonical.com [cvs]: https://cvs.nongnu.org @@ -73,38 +50,27 @@ Unlike traditional diff tools, Diffuse excels at comparing multiple files simult [rcs]: https://www.gnu.org/software/rcs/ [svn]: https://subversion.apache.org -## 📚 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 - -## 💬 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. +## Documentation -## 📄 License +For a more detailed documentation for users, translators and developers, see +the [documentation](docs/). -**Diffuse** is released under the [GPLv2](COPYING) license. +## Contact -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. +Discuss with us on Matrix at [#diffuse:matrix.org](https://matrix.to/#/#diffuse:matrix.org). -## 👥 Credits +## Licenses -**Copyright & Maintainers:** -- Copyright (C) 2006-2019 Derrick Moser -- Copyright (C) 2015-2023 Romain Failliot +Diffuse is under the [GPLv2](COPYING). -**Design:** -- Icon designed by [@jimmac](https://github.com/jimmac) +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. -## 🔗 Project History +Copyright (C) 2006-2019 Derrick Moser +Copyright (C) 2015-2023 Romain Failliot -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: +Icon made by [@jimmac](https://github.com/jimmac). -We've continued development to ensure Diffuse remains a reliable and modern tool for file comparison and merging. +This repository is a fork of the original project on SourceForge, which doesn't +seem to be maintained anymore: .