WinMerge is a great diff
tool.
A few options to change (Edit/Options)
Compare: Ignore Carriage Return Differences
System: Add to explorer context Menu + Enable advanced menu +
Include subfolders by default
External editor: C:\Program Files\Notepad++\notepad++.exe
Backup File: Untick File Backup