(You can ignore the "only in" files, because I failed to run patch with -E, or whatever it is that removes files which are empty.)