DiffMerge is a free tool that visually compares and merges files and folders, showing line and character differences and supporting three-way merges of edits. What is DiffMerge? DiffMerge is a free ...