Rediffing run-in-background.patch with common diff options.