I use Araxis Merge. It's expensive but it's hands-down, the best merge / diff utility I've ever used. All the rest look and feel like toys in comparison.