3 ms·kdiff3 is a very good gui tool for that.by scotty79 4y agokdiff3 is a very good gui tool for that.