I ran across a little gem the other day when I was looking for a file comparison program to replace the (much outdated) UltraEdit that I had been previously using. I hit up Google and one of the first results was for CSDiff.
Whoa, how could I have lived without this!?!?
It takes the existing version of the file (and/or folders!) and will markup all changes/differences. And it’s FREE!