PepsiCo and The Coca-Cola Co have both agreed to end litigation in their dispute over the Gatorade and Powerade sports drink brands.