You may need to get a better diff tool!
The bad news is WinDiff finds changes in nearly every file. The good news is that the vast majority of the changes appear to be additions to the 1.0.5 standard core which should have no bearing on the '1284 processor or add new features. I found just one "conflict" that should be easy to get past.
Is the goal to use the standard core source files?