RECENT POSTS
- Introduction to FreeBSD Security Best Practices
- Working with Package Management in FreeBSD
- Understanding FreeBSD Security Advisories and Updates
- Troubleshooting Common System Administration Issues in FreeBSD
- Tips for Hardening FreeBSD to achieve System Protection
- Setting Up DHCP Server in FreeBSD
- Secure User and Group Management in FreeBSD Systems
- Secure Remote Access with SSH in FreeBSD
- Optimizing System Performance in FreeBSD
- Network Packet Capture with tcpdump in FreeBSD
- All posts ...
Do you have GDPR compliance issues ?
Check out Legiscope a GDPR compliance software, that will save you weeks of work, automating your documentation, the training of your teams and all processes you need to keep your organisation compliant with privacy regulations
Diffuse
Jul 20, 2023
Graphical n-way diff and merge tool written in Python
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 Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories 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
- Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, SVK support
- support for UTF-8 encoded unicode
- unlimited undo
- easy keyboard navigation
WWW http//diffuse.sourceforge.net/
Checkout these related ports:
- Zziplib - Library to provide transparent read access to zipped files
- Zydis - Fast and lightweight x86/x86-64 disassembler library
- Zycore-c - Support library with platform independent types, macros, etc for Zydis
- Zthread - Platform-independent object-oriented C++ threading library
- Zookeeper - Coordination Service for Distributed Applications
- Zls - Zig LSP implementation + Zig Language Server
- Zfp - High throughput library for compressed floating-point arrays
- Zeal - Offline documentation browser
- Zapcc - C++ caching compiler based on clang
- Zanata-platform - Web-based translation platform
- Zanata-cli - Zanata Java command line client
- Z88dk - Complete Z80/Z180 development kit
- Z80ex - ZiLOG Z80 CPU emulator library
- Z80asm - Assembler for the Z80 microprocessor
- Z80-asm - Z80 assembly code assembler and disassembler