Beyond Compare is a directory compare utility and a file compare utility wrapped in one.

Synchronize files between laptop and PC, home and office, etc.

Compare directory trees side-by-side with mismatches highlighted.

Display text files side-by-side with changes highlighted.

Great for merging changes to source code.

Supports minor editing, Unicode text files, and Delphi form files.

Save favorite sessions for quick access.

Built-in FTP and zip support.

Here are some key features of "Beyond Compare":

· compare text files
· compare folders, zip archives, ftp sites
· update websites
· merge code changes
· compare program output.


Limitations:

· 30 days trial.