WinMerge
Winmerge not merging end comment */ when it's the only thing left.
I will occasionally comment out sections of code while testing using /* */
When the */ appears by itself on a line, and you have merged all other changes, Winmerge sees it, and highlights it with the "Ignored" color, and acts like there are no differences in the "Location Pane", and "Next Difference" doesn't find it. This leaves your code with an open comment block if it's off the screen, and you don't see it/find it and manually type it in.
It seems that either the "Ignore Comment Differences" compare option or the "IgnoreCommentsC" prediffer plugin is enabled. Please try disabling it.
It seems that either the "Ignore Comment Differences" compare option or the "IgnoreCommentsC" prediffer plugin is enabled. Please try disabling it.
The "Ignore comment differences" plugin is indeed enabled. And disabling it does indeed fix it.
I guess the issue is that in some cases, it doesn't recognize the full comment - so the first part of the comment is a difference, and then when you choose it with the "Next difference" and then "Copy to right", it re-evaluates and the end-comment is now a comment and ignored (leaving you with a broken file).
Me - I will disable comment differences and go on. Thanks for pointing that out.