KDiff3 with TortoiseSVN a winner
KDiff3 is a free, cross-platform diff and merge tool. TortoiseSVN is the Windows shell integration for Subversion (SVN), the version control system that preceded widespread Git adoption.
The problem KDiff3 solves
Most diff tools highlight the entire line when something changes. If you have a long line with a two-character difference buried in the middle, you are left scanning manually to find it. KDiff3 highlights changes at the character level within a line, so you can see exactly which characters differ at a glance.
Configuring TortoiseSVN to use KDiff3
- Right-click any file or folder to open the TortoiseSVN context menu
- Choose Settings
- Select the Diff/Merge tab
- Set both the diff program and the merge program to point to your KDiff3 executable
That is all there is to it. From that point on, every diff and three-way merge in TortoiseSVN opens in KDiff3.
Still useful today
SVN has largely been replaced by Git, but KDiff3 itself has continued to be maintained and works as an external diff and merge tool with Git, as well as other modern VCS clients that support configurable diff programs.
Originally posted in 2004. Via Craig Andrea.
Solution Architect with 30 years in cloud infrastructure, security, identity, and .NET engineering.