P4merge from Perforce works even better. It's just a file merge tool, and doesn't require you to use Perforce.

I've got a git merge/diff wrapper that falls back from p4merge to idea and finally back to stock diff.