Total Commander is a Windows based file management program with the good plugin system.

Araxis Merge two and three-way file comparison (diff) and merging application.

WinMerge is an Open Source differencing and merging tool for Windows.

Diffuse is a small and simple text merge tool written in Python. With Diffuse, you can easily merge, edit, and review changes to your code.