I've been a passionate Beyond Compare user for about 2 decades now. I swear by it. Great for diffing images as well.