Question: do a diff in notepad++?
Answer: Next select the Compare plugin and click Install: Now open both of the files you would like to compare as two separate tabs in Notepad++. Then from the Plugins menu selecct Compare -> Compare (or use the shortcut Alt+D): Your two files will now be opened side-by-side with conflicting lines highlighted.