Araxis Merge. It's not free, but I've never used anything as good as it.