File/folder compare/merge utility. Guiffy is a visual file/folder compare merge utility. It's features include: 3-way smart merge, ComparEdit(great for finding/moving a bug fix from one version to another), InLine diffs hiliting, Integrated folder/filetree compare, Unicode and MBCS plus over 150 file encoding formats.