Comment: Re:vi/emacs/eclipse/whatever + svn? (Score 1) 286
Netbeans has subversion integration built into it, and function as a real-time diff from your working copy. It sounds like that would solve the problem the best. I don't use it myself anymore, and I don't know how it handles large files, but it's available on every platform, free, and will do what you asked. You do need to have a subversion repository, of course, though.