[greghacke]

Both diff and patch are available under Windows 9x/NT. You can also superimpose to create a diff through Metapad (a free replacement for Notepad with unlimited file size, standard and floating tabs, multiple font support, word wrap and, best of all, cursor line and column tracking.) right now, I use MetaPad to create adjustments to the files. I can then track all my changes and repair as required.