German sportswear giants Puma and Adidas are to end a 60 year feud, started by their founding brothers, with a friendly football match.