Sean 'Diddy' Combs has settled his legal dispute with a liquor company over alleged racism.