Diageo and Sainsbury's have come to an agreement over the UK supermarket's Pimm's-like beverage, Pitchers.