I just use "diff -u", but if you want a decent diff-gui "kompare" or "kdiff" are not bad (KDE of course).