+1 on this. Beyond Compare is one of the few reasons I keep a Windows VM around these days, it's just that damn good.