diffmerge, visual merging for multiple systems

I've been missing Beyond Compare since I've moved to OSX, but DiffMerge is pretty decent.