xxdiff is a graphical file and directories comparator and merge tool.