Visual Merge
Visual Merge is a visual directory compare and file merge utility. The program shows two files side-by-side and highlights the differences between them. The user can select which version will be used in the merged file with a single mouse click.