OK, a try for my first diff. I couldn't use SVN (no source tree, I edited the files in the filesystem directly).I did a diff for the four files and concatednated into one file. However, I'm not sure about the exact syntax for this; I've edited the old and new file names - can you check if this looks OK?