-
Notifications
You must be signed in to change notification settings - Fork 810
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
"Ignore comment differences" still compares inline comments #2008
Comments
Perhaps there is also a difference one line above or one line below the line shown in the example? |
Thank you for providing the screenshot. I have been able to reproduce this issue (I couldn't reproduce it before because I hadn't tried it without inline comments in the other file). I have fixed it in commit 7a0b9a9, so I will now close this issue. |
Issue:
Inline comments (end of line comments) should be ignored when user enables "Ignore comment differences". Currently WinMerge still marks these lines as different when the actual code is the same.
Example:
if ((WindowWidth >= Buffer->Width * 2) && // If display can support a 2x scale full screen
^ Here the comment "If display can support a 2x scale full screen" line is highlighted in orange and red, even though user has chosen to ignore comment differences.
What should happen:
WinMerge should not include the comment for comparison per user preference. The line should not trigger orange and red highlighting because the code to the left of the comment is the same in both files.
Use case:
User is taking a course with new source code released every day. User wants to keep their own comments but still diff/compare/merge daily course installments one line at a time.
The text was updated successfully, but these errors were encountered: