https://bugs.kde.org/show_bug.cgi?id=411602
Bug ID: 411602
Summary: Unable to choose a file for all unsolved whitespace
conflicts in 1.8
Product: kdiff3
Version: 1.8.x
Platform: Gentoo Packages
OS: Linux
Status: REPORTED
Severity: normal
Priority: NOR
Component: application
Assignee: [email protected]
Reporter: [email protected]
Target Milestone: ---
Created attachment 122494
--> https://bugs.kde.org/attachment.cgi?id=122494&action=edit
Restores ability to choose a file for all unsolved whitespace conflicts
SUMMARY 1.8.1 (64 bit) Dropped support for choosing [A-C] for unsolved
whitespace conflicts
STEPS TO REPRODUCE
1. Install Version 0.9.98, merge some files with whitespace conflicts, you can
choose A B or C from the 'Merge' menu
2. Install 1.8.1 the choice is gone from the 'Merge' menu
OBSERVED RESULT
Unable to choose a file for all unsolved whitespace conflicts
EXPECTED RESULT
Same functions as 0.9.98, Should have a Merge menu option to chose A-C for all
unsolved conflicts and all unsolved whitespace conflicts.
SOFTWARE/OS VERSIONS
Windows:
macOS:
Linux/KDE Plasma:
(available in About System)
KDE Plasma Version:
KDE Frameworks Version: 5.60.0
Qt Version: 5.12.3
ADDITIONAL INFORMATION
Attached patch putting functionality back in.
I am currently running the patch in Gentoo and it works.
Note: you might need to clean up the whitespace in the patch.
--
You are receiving this mail because:
You are watching all bug changes.
