Brown-Forman has settled its dispute with Diageo over the distribution of the Jack Daniel's Tennessee Whiskey brand in the UK, the company announced yesterday.