Beyond Compare is a multi-platform utility that combines directory compare and file compare functions in one package.