Package: kdiff3
Version: 1.8.01-1+b1
Severity: normal
The Merge menu items to Choose A/B/C Everywhere or For All Unsolved
(Whitespace) Conflicts are not showing up in the kdiff3 build in bullseye.
Downgrading to the version in buster and they show up again.
I also tried 1.8.01-1 from snapshot.debian.org and it has the same issue.
The changelog shows this entry:
Don't enable "Choose C for Everthing" on two way merge
but this is also seeming to happen on 3 way merge (via git mergetool)
-- System Information:
Debian Release: bullseye/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'stable-updates'), (500, 'stable'), (490,
'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.6.0-2-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages kdiff3 depends on:
ii kio 5.70.1-1
ii libc6 2.30-8
ii libkf5configcore5 5.70.0-1
ii libkf5configwidgets5 5.70.0-1
ii libkf5coreaddons5 5.70.0-1
ii libkf5crash5 5.70.0-1
ii libkf5i18n5 5.70.0-1
ii libkf5iconthemes5 5.70.0-1
ii libkf5kiocore55.70.1-1
ii libkf5kiowidgets5 5.70.1-1
ii libkf5parts5 5.70.0-1
ii libkf5textwidgets55.70.0-1
ii libkf5widgetsaddons5 5.70.0-1
ii libkf5xmlgui5 5.70.0-1
ii libqt5core5a 5.12.5+dfsg-10+b1
ii libqt5gui55.12.5+dfsg-10+b1
ii libqt5printsupport5 5.12.5+dfsg-10+b1
ii libqt5widgets55.12.5+dfsg-10+b1
ii libstdc++610.1.0-3
Versions of packages kdiff3 recommends:
ii kdiff3-doc 1.8.01-1
kdiff3 suggests no packages.
-- no debconf information
