WinMerge is an Open Source differencing and merging tool for Windows that visually compares and merges text files and folders.

Meld is a visual diff and merge tool for comparing and merging files and directories, used by software developers for version control.