kdiff3 - Graphical tool for merging two or three files or directories - View it on GitHub