windiff is okay

or use the diff that comes with <insert major version control software> (Subversion, Perforce, VSS..etc)