Hacker News new | ask | show | jobs
by phillipppp 2212 days ago
Maybe Meld: http://meldmerge.org/

The google search that may help would be for "merge tools".