2021-11-24 18:06:40 +00:00
|
|
|
<h1 align="center">
|
2023-04-07 18:02:25 +00:00
|
|
|
<img
|
|
|
|
|
src="./data/icons/hicolor/scalable/apps/io.github.mightycreak.Diffuse.svg"
|
|
|
|
|
alt="Diffuse"
|
|
|
|
|
width="192"
|
|
|
|
|
height="192"/><br/>
|
2021-11-24 18:06:40 +00:00
|
|
|
</h1>
|
|
|
|
|
|
|
|
|
|
<p align="center" style="margin-top: 2em">
|
|
|
|
|
<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">
|
2021-11-28 03:10:10 +00:00
|
|
|
<a href="https://github.com/MightyCreak/diffuse/actions/workflows/ci.yml">
|
2023-04-07 18:02:25 +00:00
|
|
|
<img
|
|
|
|
|
src="https://github.com/MightyCreak/diffuse/actions/workflows/ci.yml/badge.svg"
|
|
|
|
|
alt="CI status"/>
|
2021-11-24 18:06:40 +00:00
|
|
|
</a>
|
|
|
|
|
<a href="https://repology.org/project/diffuse/versions">
|
|
|
|
|
<img src="https://repology.org/badge/tiny-repos/diffuse.svg" alt="Packaging status">
|
|
|
|
|
</a>
|
|
|
|
|
</p>
|
2015-11-21 18:21:21 +00:00
|
|
|
|
2021-11-27 22:45:52 +00:00
|
|
|
Diffuse is a graphical tool for merging and comparing text files. Diffuse is
|
2015-11-21 17:57:32 +00:00
|
|
|
able to compare an arbitrary number of files side-by-side and gives users the
|
2021-11-27 22:45:52 +00:00
|
|
|
ability to manually adjust line matching and directly edit files. Diffuse can
|
|
|
|
|
also retrieve revisions of files from several VCSs for comparison and merging.
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
|
|
|
Some key features of Diffuse:
|
|
|
|
|
|
2015-11-21 18:21:21 +00:00
|
|
|
* 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
|
2021-11-27 22:45:52 +00:00
|
|
|
* Supports several VCS: [Bazaar][bzr], [CVS][cvs], [Darcs][darcs], [Git][git],
|
2023-04-16 18:00:03 +00:00
|
|
|
[Mercurial][hg], [Monotone][mtn], [RCS][rcs] and [Subversion][svn]
|
2015-11-21 18:21:21 +00:00
|
|
|
* Unicode support
|
|
|
|
|
* Unlimited undo
|
|
|
|
|
* Easy keyboard navigation
|
2015-11-21 17:57:32 +00:00
|
|
|
|
2021-11-27 22:45:52 +00:00
|
|
|
[bzr]: https://bazaar.canonical.com
|
|
|
|
|
[cvs]: https://cvs.nongnu.org
|
|
|
|
|
[darcs]: http://darcs.net
|
|
|
|
|
[git]: https://git-scm.com
|
|
|
|
|
[hg]: https://www.mercurial-scm.org
|
|
|
|
|
[mtn]: https://www.monotone.ca
|
|
|
|
|
[rcs]: https://www.gnu.org/software/rcs/
|
|
|
|
|
[svn]: https://subversion.apache.org
|
|
|
|
|
|
2021-11-24 17:26:26 +00:00
|
|
|
## Documentation
|
2015-11-21 17:57:32 +00:00
|
|
|
|
2021-11-24 17:26:26 +00:00
|
|
|
For a more detailed documentation for users, translators and developers, see
|
|
|
|
|
the [documentation](docs/).
|
2021-01-11 18:58:43 +00:00
|
|
|
|
2023-04-07 18:02:25 +00:00
|
|
|
## Contact
|
|
|
|
|
|
|
|
|
|
Discuss with us on Matrix at [#diffuse:matrix.org](https://matrix.to/#/#diffuse:matrix.org).
|
|
|
|
|
|
2021-01-11 18:58:43 +00:00
|
|
|
## Licenses
|
|
|
|
|
|
|
|
|
|
Diffuse is under the [GPLv2](COPYING).
|
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
The file [io.github.mightycreak.Diffuse.appdata.xml.in](data/io.github.mightycreak.Diffuse.appdata.xml.in)
|
2021-01-11 18:58:43 +00:00
|
|
|
is licensed under the [FSF-AP](https://www.gnu.org/prep/maintain/html_node/License-Notices-for-Other-Files.html)
|
|
|
|
|
license.
|
|
|
|
|
|
|
|
|
|
Copyright (C) 2006-2019 Derrick Moser <derrick_moser@yahoo.com>
|
2023-04-03 16:38:04 +00:00
|
|
|
Copyright (C) 2015-2023 Romain Failliot <romain.failliot@foolstep.com>
|
2021-01-11 18:58:43 +00:00
|
|
|
|
|
|
|
|
Icon made by [@jimmac](https://github.com/jimmac).
|
2023-04-03 16:46:33 +00:00
|
|
|
|
|
|
|
|
This repository is a fork of the original project on SourceForge, which doesn't
|
|
|
|
|
seem to be maintained anymore: <https://sourceforge.net/projects/diffuse/>.
|
