https://bugs.kde.org/show_bug.cgi?id=439256
Bug ID: 439256 Summary: Comments are treated as whitespace even when not selected in preferences Product: kdiff3 Version: 1.9.2 Platform: openSUSE RPMs OS: Linux Status: REPORTED Severity: normal Priority: NOR Component: application Assignee: reeves...@gmail.com Reporter: tilman.vo...@web.de Target Milestone: --- In 1.9.2 and later, changes in C-style comments are treated as "only whitespace" differences even when the corresponding setting in the preferences is not active. STEPS TO REPRODUCE 1. Make sure the "Ignore C/C++ comments (treat as white space)" option is off under Configure->Diff 2. Run a merge with the attached files: LANG=C kdiff3 -m {A,B}.txt 3. Take a look at how the difference in the comment-only line is treated. OBSERVED RESULT The change in the comment is marked as "Merge Conflict (Whitespace only)". EXPECTED RESULT The change in the comment is marked as "Merge Conflict". SOFTWARE/OS VERSIONS Operating System: openSUSE Tumbleweed 20210524 KDE Plasma Version: 5.21.5 KDE Frameworks Version: 5.82.0 Qt Version: 5.15.2 Kernel Version: 5.12.4-1-default OS Type: 64-bit Graphics Platform: X11 Processors: 8 × Intel® Core™ i7-7700HQ CPU @ 2.80GHz Memory: 15.5 GiB of RAM Graphics Processor: Mesa DRI Intel® HD Graphics 630 ADDITIONAL INFORMATION -- You are receiving this mail because: You are watching all bug changes.