The easiest way is to use git to apply the same changes to the new files. You can create a patch and then apply that patch to an upgraded clone of the repository. Git will tell you when conflicts occur and you can fix those manually. Do note this is exactly why we recommend using a plugin for customization: it's much easier to keep plugins up to date than modify your customizations to core every time we modify the file.