I always thought the two of them didn't get along that well
They haven't.  That's why this is such a 
big deal.  Gilmour also said he will play Comfortably Numb for one of Waters' upcoming Wall concerts.  I have a feeling he'll probably play an entire show, likely in London.
Speculation/hope is that he will join for the entire tour.
Paul