Comment on FileMerge

I was starting to like this and the fact that it was free, but it doesn't merge folders which makes this useless to me. I've been using Changes.app now.