xxdiff is a graphical file and directories comparator and merge tool. It features line-level diffs and a very efficient merge worflow using hotkeys and mouse clicks. It uses the Qt3 toolkit and works best in X11. An unofficial Mac OS X build is also available.