Used Diffuse for Windows?
Developer’s Description
Diffuse is a graphical tool for merging and comparing text files. Diffuse is able to compare an arbitrary number of files side-by-side and gives users the ability to manually adjust line-matching and directly edit files. Diffuse can also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories for comparison and merging.
Explore More

Hasher Lite
FreeBatch File Manager
Trial versionBatch File Utility
Trial versionWinFR Folders
Trial versionPartition Logic
FreeTagging for Windows
FreeSlingvine Slinger
Free
Celframe Sync
Trial versionSearch GT
Trial versionMeeSoft Commander
FreeLong File Path Lister
Free
IUWEshare External Drive Data Recovery Wizard
Trial version