calls comparePlus “Choose for in-editor file comparison and lightweight merging if you already work in Notepad++, not for folder diff/merge.”
WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle.