Downloadtkdiff is a graphical front end to the diff program. It provides a side-by-side view of the differences between two text files, along with several innovative features such as diff bookmarks, a graphical map of differences for quick navigation, and a facility for slicing diff regions to achieve exactly the merge output desired.
Features
- Interfaces with several SCM systems such as Subversion, Git, Mercurial and more
- Runs on multiple platforms
- Permits Diff-region repartitioning for EXACT merging
- Provides statistics/reports on the breadth of changes
- Highly configurable interface, with personalized defaults
- Usable with multiple differencing engines, if desired
- Supports directory-level comparison (including recursion) as well as individual file-level
- Fully supports 3-way merging and can help resolve conflicts
Project Samples
License
GNU General Public License version 2.0 (GPLv2)Follow tkdiff
You Might Also Like
Venn is a secure workspace for remote work that isolates and protects work from any personal use on the same computer. Work lives in a secure local enclave that is company controlled, where all data is encrypted and access is managed. Within the enclave – visually indicated by the Blue Border around these applications – business activity is walled off from anything that happens on the personal side. As a result, work and personal uses can now safely coexist on the same computer.
Rate This Project
Login To Rate This Project
User Reviews
Be the first to post a review of tkdiff!