Call it Cognac diplomacy. France offered China’s Xi a special drink, in a wink at their trade spat