Diffuse is a small and simple text merge tool written in Python. With Diffuse, you can easily merge, edit, and review changes to your code. Developed by Derrick Moser, Henri Menke
License: Open Source
Feature | Diffuse | Meld |
---|---|---|
Side-by-Side comparison | ||
Folder Comparison | ||
One-click merging | ||
Real Time Comparison | ||
Compare Source Code | ||
Diff detection | ||
Plugins | ||
Portable | ||
Directory sync | ||
File-sync | ||
Folder sync | ||
Windows Explorer integration | ||
3 way merge | ||
Text Wrapping | ||
Support for FTP | ||
Intuitive Interface | ||
Readability | ||
High-dpi support | ||
Data Compare | ||
Compare texts analysis | ||
Developer Tools | ||
Merge Files | ||
Syntax Highlighting | ||
Git-flow integration | ||
GitHub integration | ||
Command line interface | ||
Configurable |