Winmerge is so great. Mac and Linux users look at Windows devs with pity, and probably with good reason (only someone with approximately equal hours on different platforms can really judge) but we do have some nice things.