Just stumbled across Meld and it’s a perfect discrete tool for visually diffing files, plus it builds on that with a UI that makes it trivial to do interactive partial merge of files in either direction.