FileMerge on steroids (for files and folders). Pretty damn good, judging from the results I get running it on my Yaki live and development trees. Also includes TextMate support.