Guiffy eXpert Windows
guiffy is a visual file compare, diff merge and folder compare tool for windows
CodeCompare
free tool for code comparison within visual studio environment and a standalone
Tag: 3 way merge