124d086009
|
||
|---|---|---|
| .github/workflows | ||
| .vscode | ||
| build-aux/meson | ||
| data | ||
| docs | ||
| po | ||
| src | ||
| utils | ||
| windows-installer | ||
| .editorconfig | ||
| .flake8 | ||
| .gitignore | ||
| .mypy.ini | ||
| .pylintrc | ||
| AUTHORS | ||
| CHANGELOG.md | ||
| COPYING | ||
| README.md | ||
| io.github.mightycreak.Diffuse.yml | ||
| meson.build | ||
| meson_options.txt | ||
| requirements.txt | ||
README.md
Diffuse
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 Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories 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
- Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK support
- Unicode support
- Unlimited undo
- Easy keyboard navigation
Documentation
For a more detailed documentation for users, translators and developers, see the documentation.
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-2021 Romain Failliot romain.failliot@foolstep.com
Icon made by @jimmac.