https://github.com/mightycreak/diffuse

Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.
https://github.com/mightycreak/diffuse

git gtk python text-diff

Last synced: 4 days ago
JSON representation

Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.

• Host: GitHub
• URL: https://github.com/mightycreak/diffuse
• Owner: MightyCreak
• License: gpl-2.0
• Created: 2015-11-21T18:02:37.000Z (about 9 years ago)
• Default Branch: main
• Last Pushed: 2024-08-24T16:04:45.000Z (4 months ago)
• Last Synced: 2024-12-22T09:03:52.875Z (4 days ago)
• Topics: git, gtk, python, text-diff
• Language: Python
• Homepage: http://mightycreak.github.io/diffuse/
• Size: 2.18 MB
• Stars: 278
• Watchers: 15
• Forks: 46
• Open Issues: 35
• Metadata Files:
  • Readme: README.md
  • Changelog: CHANGELOG.md
  • License: COPYING
  • Authors: AUTHORS

Awesome Lists containing this project

README

        


  






  

    

  





  

    

  

  

    

  



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][bzr], [CVS][cvs], [Darcs][darcs], [Git][git],

  [Mercurial][hg], [Monotone][mtn], [RCS][rcs] and [Subversion][svn]

* Unicode support

* Unlimited undo

* Easy keyboard navigation

[bzr]: https://bazaar.canonical.com

[cvs]: https://cvs.nongnu.org

[darcs]: http://darcs.net

[git]: https://git-scm.com

[hg]: https://www.mercurial-scm.org

[mtn]: https://www.monotone.ca

[rcs]: https://www.gnu.org/software/rcs/

[svn]: https://subversion.apache.org

## Documentation

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

the [documentation](docs/).

## Contact

Discuss with us on Matrix at [#diffuse:matrix.org](https://matrix.to/#/#diffuse:matrix.org).

## Licenses

Diffuse is under the [GPLv2](COPYING).

The file [io.github.mightycreak.Diffuse.appdata.xml.in](data/io.github.mightycreak.Diffuse.appdata.xml.in)

is licensed under the [FSF-AP](https://www.gnu.org/prep/maintain/html_node/License-Notices-for-Other-Files.html)

license.

Copyright (C) 2006-2019 Derrick Moser   

Copyright (C) 2015-2023 Romain Failliot 

Icon made by [@jimmac](https://github.com/jimmac).

This repository is a fork of the original project on SourceForge, which doesn't

seem to be maintained anymore: .