jack

For CLI, diff has already been mentioned; for a GUI application I'd recommend meld:

https://meldmerge.org/