Need a freeware merge tool? I found a great one: WinMerge. This little guy just saved me a hour of comparing two files and trying to figure out which lines I needed from each.

How'd I get in this mess? Well, I had a dev version of my file and a live version that is running for customers. The dev version is in the midst of large bits of changes and some people using the live code needed a rather large bit of changes to be made. I made the fixes but was left with two files with large disparate chunks of changes. WinMerge fixed me right up :)