Rediffing desktop-number.patch with common diff options.