Meld - What is Meld? Meld is a visual diff and merge tool targeted at developers.
MobaXterm - Enhanced terminal for Windows with X11 server, tabbed SSH client, network tools and much more
Beyond Compare - Beyond Compare allows you to compare files and folders.
KiTTY - KiTTY is a fork from version 0.70 of PuTTY. It adds extra features to PuTTY.
Araxis Merge - Home of the award-winning Araxis Merge two and three-way file comparison (diff) and merging application, Araxis Find Duplicate Files, Araxis Replace In Files, and the Araxis Ketura issue tracking, project scheduling and time tracking application.
ConEmu - ConEmu-Maximus5 is a full-featured local terminal for Windows devs, admins and users. Get better console window with tabs, splits, Quake style, copy+paste, DosBox and PuTTY integration, and much more.