Tesco, which halted sales of goods such as Marmite and PG Tips amid a pricing row with Unilever, has settled the dispute.