[pfyon]

Yeah not sure what the ^M thing is about, I had to use regular diff rather than svn-diff, also via putty to a linux box, so probably related to encoding.

s/\^M.*$//g

Would probably do the trick.