Text based diff is fine for basic use cases. When the results are too confusing to grasp what really has changed or I want 3-way diff meld can do wonders. Unfortunately it does not scale well and chokes on huge files (like Yocto build logs). Sometimes I use kdiff3. Wasn't there a 3rd one? Obviously I haven't used it for a long time, because I can't remeber it now.