Guiffy is a program that allows you to compare and merge sources. It provides folder compare and file tree synchronization capabilities, it implements a blend of 3 different algorithms to provide the best visual file compare results (including tuneable in-line diffs highlighting) and trusted 3-way auto merge capabilities.
Comments