Rinma
/
Tough_Crowd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
446 Commits 1 Branch 0 Tags 5.6 MiB
GDScript 100%
Go to file
Sabri Ünal eb01063bfb appdata: Update appdata 
- Add vcs-browser and translate URLs
- Add the translation tag
- Mark the developer name and release descriptions as untranslatable
- Use appstreamcli to validate appdata
- Remove redundant paragraph from the translation document
 		2024-01-06 21:41:16 -05:00
.github/workflows cicd: remove Ubuntu package appstream-util 2024-01-06 21:33:15 -05:00
.vscode fix: clicking buttons in the toolbar was crashing (#189) 2023-01-22 16:11:37 -05:00
build-aux/meson Start modularizing the code 2021-11-16 17:48:34 -05:00
data appdata: Update appdata 2024-01-06 21:41:16 -05:00
docs appdata: Update appdata 2024-01-06 21:41:16 -05:00
po i18n: update the .pot and all the .po files 2023-04-16 15:28:13 -04:00
src fix(linter): fix new flake8 errors 2024-01-06 20:18:27 -05:00
tests/syntax/rust Fix #98: Implement Rust highlighting support (#99) 2022-10-24 16:16:24 -04:00
utils release: new release 0.8.2 2023-04-16 13:37:00 -04:00
windows-installer release: new release 0.8.2 2023-04-16 13:37:00 -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 fix(cicd): forgot to change the refs to master in code 2023-04-07 13:21:23 -04:00
.markdownlint.json Reword the documentation to take care of Mac OS too 2022-10-23 16:32:04 -04:00
.mypy.ini chore(mypy): silence annotation-unchecked notes 2023-04-07 11:11:55 -04:00
AUTHORS Add Romain Failliot (me) to AUTHORS 2020-06-19 21:46:29 -04:00
CHANGELOG.md chore: add changelog 2024-01-06 21:35:29 -05:00
COPYING Copy the entire text, just to be up-to-date 2021-11-13 13:25:20 -05:00
README.md feat: remove support for SVK 2023-04-16 14:02:43 -04:00
_config.yml docs: add Cayman theme 2023-04-03 13:01:35 -04:00
io.github.mightycreak.Diffuse.yml chore: update flatpak manifest 2024-01-06 20:18:27 -05:00
meson.build release: new release 0.8.2 2023-04-16 13:37:00 -04:00
meson_options.txt Add log options: log_print_output and log_print_stack 2021-11-18 12:12:12 -05:00
new_release.sh fix: new_release.sh was changing too many lines in meson.build 2023-04-16 13:37:13 -04:00
requirements.dev.txt chore: update Python packages 2023-04-03 12:10:35 -04:00
requirements.txt chore: update Python packages 2023-04-03 12:10:35 -04:00

README.md

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 and Subversion
  • Unicode support
  • Unlimited undo
  • Easy keyboard navigation

Documentation

For a more detailed documentation for users, translators and developers, see the documentation.

Contact

Discuss with us on Matrix at #diffuse:matrix.org.

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-2023 Romain Failliot romain.failliot@foolstep.com

Icon made by @jimmac.

This repository is a fork of the original project on SourceForge, which doesn't seem to be maintained anymore: https://sourceforge.net/projects/diffuse/.