Meld is a graphical file and text difference tool that is useful for identify differences and merging changes between files.
Pricing
Meld is free and open source.