Quote Originally Posted by icosahedron View Post
WinMerge - compares two versions of a document with the option to merge them.
Oooh. I used to love WinMerge. I used it all the time to compare code that I was working on. It was on my computer at work, and I never got around to installing it at home, so I'd forgotten about it.