That is called a diff file. It is a list of changes between two files, and the easiest way to merge the changes is to input that using "patch" on linux. If you research "patch", you can probably find some alternatives for windows too