WinMerge - if you ever need a graphical diff/merge tool for Windows. Open Source.