Rinma
/
Tough_Crowd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
319 Commits 1 Branch 0 Tags 5.6 MiB
GDScript 100%
Go to file
Romain Failliot d9c0efcbd0 Don't use new() in utils.py 2022-04-04 14:33:01 -04:00
.github/workflows Linters no longer need Diffuse to be installed 2021-11-27 21:55:49 -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 Prepare files for new release: 0.7.4 2022-04-03 20:10:53 -04:00
docs Update translation POT and FR files 2022-04-04 12:00:53 -04:00
po Update all translation files 2022-04-04 12:21:05 -04:00
src Don't use new() in utils.py 2022-04-04 14:33:01 -04:00
utils Prepare files for new release: 0.7.4 2022-04-03 20:10:53 -04:00
windows-installer Prepare files for new release: 0.7.4 2022-04-03 20:10:53 -04:00
.editorconfig Prepare for release v0.7.3 2021-11-22 21:11:39 -05:00
.flake8 ci: call the linters on the installed directory 2021-11-24 20:27:47 -05:00
.gitignore Un-ignore diffuse.pot 2021-11-18 15:40:16 -05:00
.mypy.ini Convert some functions to static typing 2022-01-08 17:54:39 -05:00
AUTHORS Add Romain Failliot (me) to AUTHORS 2020-06-19 21:46:29 -04:00
CHANGELOG.md Update CHANGELOG.md 2022-04-04 11:35:03 -04:00
COPYING Copy the entire text, just to be up-to-date 2021-11-13 13:25:20 -05:00
README.md Fix CI status link in README.md 2021-11-27 22:10:10 -05:00
io.github.mightycreak.Diffuse.yml Upgrade Flatpak GNOME's runtime to 42 2022-04-03 19:25:24 -04:00
meson.build Prepare files for new release: 0.7.4 2022-04-03 20:10:53 -04:00
meson_options.txt Add log options: log_print_output and log_print_stack 2021-11-18 12:12:12 -05:00
requirements.dev.txt Created a requirements.dev.txt just for the developers 2021-11-24 20:39:00 -05:00
requirements.txt Created a requirements.dev.txt just for the developers 2021-11-24 20:39:00 -05:00

README.md

Diffuse
Diffuse

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, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion and SVK
  • 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.