Meld is a great, free tool available on pretty much all platforms. Been using it for a long old time now and can't recommend it enough. 2-way, 3-way and folder

Meld is a great, free tool available on pretty much all platforms. Been using it for a long old time now and can't recommend it enough. 2-way, 3-way and folder diff, in-place editing, it has all I need.