https://bugs.kde.org/show_bug.cgi?id=499772
Helga <okit...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |okit...@gmail.com
--- Comment #3 from Helga <okit...@gmail.com> ---
I have just hit upon this issue in kdiff3 1.12.2 in Kubuntu 25.04 (Plasma
6.3.4, Frameworks 6.12.0, Qt 6.8.3, Gear 24.12.3) with Wayland.
Logging out and logging back in from KDE(X11), however, this issue doesn't come
up on the same merge conflict.
Since git mergetool creates _LOCAL, _REMOTE, _BASE files and then runs `kdiff3
$LOCAL $REMOTE $BASE -o $MERGED`, would be nice to attach files for which this
reproduces to this ticket. Unfortunately, I cannot do this myself because the
code I'm working on is non-FOSS.
--
You are receiving this mail because:
You are watching all bug changes.
