Rinma
/
Tough_Crowd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
252 Commits 1 Branch 0 Tags 5.6 MiB
GDScript 100%
Go to file
Creak 4347226b14
Merge pull request #129 from MightyCreak/update-docs 
Improve the documentation
 		2021-11-24 12:45:17 -05:00
.github/workflows Add po/ to the linters 2021-11-24 10:41:11 -05:00
.vscode Start modularizing the code 2021-11-16 17:48:34 -05:00
build-aux/meson Start modularizing the code 2021-11-16 17:48:34 -05:00
data Update POTFILES and .pot files 2021-11-24 10:30:33 -05:00
docs Improve the documentation 2021-11-24 12:38:54 -05:00
po Improve the documentation 2021-11-24 12:38:54 -05:00
src Fix all mypy errors 2021-11-22 20:54:46 -05:00
utils Prepare for release v0.7.3 2021-11-22 21:11:39 -05:00
windows-installer Prepare for release v0.7.3 2021-11-22 21:11:39 -05:00
.editorconfig Prepare for release v0.7.3 2021-11-22 21:11:39 -05:00
.flake8 Add po/ to the linters 2021-11-24 10:41:11 -05:00
.gitignore Un-ignore diffuse.pot 2021-11-18 15:40:16 -05:00
.mypy.ini Fix all mypy errors 2021-11-22 20:54:46 -05:00
.pylintrc pylint: enable import-error, no-name-in-module, no-self-use 2021-11-21 15:32:16 -05:00
AUTHORS Add Romain Failliot (me) to AUTHORS 2020-06-19 21:46:29 -04:00
CHANGELOG.md Improve the documentation 2021-11-24 12:38:54 -05:00
COPYING Copy the entire text, just to be up-to-date 2021-11-13 13:25:20 -05:00
README.md Improve the documentation 2021-11-24 12:38:54 -05:00
io.github.mightycreak.Diffuse.yml Upgrade gnome runtime from 3.38 to 41 2021-11-18 14:58:16 -05:00
meson.build Prepare for release v0.7.3 2021-11-22 21:11:39 -05:00
meson_options.txt Add log options: log_print_output and log_print_stack 2021-11-18 12:12:12 -05:00
requirements.txt Add mypy job in CI 2021-11-22 20:54:44 -05:00

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

Installation

This is the easiest way to install Diffuse:

flatpak install io.github.mightycreak.Diffuse

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.