Rinma
/
Tough_Crowd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
396 Commits 1 Branch 0 Tags 5.6 MiB
GDScript 100%
Go to file
Creak f6feded2da
Merge pull request #198 from MightyCreak/main 
chore: create new main branch
 		2023-04-07 11:42:42 -04:00
.github/workflows chore: update Python packages 2023-04-03 12:10:35 -04: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 Prepare for release 0.8.0 2023-04-03 14:33:18 -04:00
docs docs: add new screenshots for appstream + supports 2023-04-03 13:52:51 -04:00
po po: Add Georgian translation (#191) 2023-03-18 16:54:44 -04:00
src feat: improve log stack trace 2023-04-07 11:11:45 -04:00
tests/syntax/rust Fix #98: Implement Rust highlighting support (#99) 2022-10-24 16:16:24 -04:00
utils Prepare for release 0.8.0 2023-04-03 14:33:18 -04:00
windows-installer Prepare for release 0.8.0 2023-04-03 14:33:18 -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
.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: create new main branch 2023-04-07 11:36:31 -04:00
COPYING Copy the entire text, just to be up-to-date 2021-11-13 13:25:20 -05:00
README.md docs: add fork disclaimer in the README 2023-04-03 13:01:37 -04:00
_config.yml docs: add Cayman theme 2023-04-03 13:01:35 -04:00
io.github.mightycreak.Diffuse.yml chore: update to GNOME 44 2023-04-03 11:56:16 -04:00
meson.build Prepare for release 0.8.0 2023-04-03 14:33:18 -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 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, 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-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/.