Sean ‘Diddy’ Combs, the US rapper, has withdrawn his lawsuit against Diageo as part of a settlement with the London-based spirits giant. In June…