@b0rk Personally, I'm a fan of Meld (https://meldmerge.org/) it works well for somewhat complicated comparisons, and even can be used as a diff-tool for git!
It does have a tendency to bog down and get sluggish on very large files, though