https://bugs.kde.org/show_bug.cgi?id=493597
michael <reeves...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|REPORTED |RESOLVED
Resolution|--- |FIXED
Latest Commit| |https://invent.kde.org/sdk/
| |kdiff3/-/commit/befbaa8d7a4
| |2f4899e04decc740dfb9e48e7d0
| |fc
Version Fixed In| |1.11.5
--- Comment #1 from michael <reeves...@gmail.com> ---
Git commit befbaa8d7a42f4899e04decc740dfb9e48e7d0fc by Michael Reeves.
Committed on 16/10/2024 at 02:45.
Pushed by mreeves into branch '1.11'.
Fix broken merge encoding detection
FIXED-IN:1.11.5
M +3 -1 src/SourceData.cpp
M +2 -2 src/SourceData.h
M +7 -7 src/mergeresultwindow.cpp
M +1 -1 src/mergeresultwindow.h
https://invent.kde.org/sdk/kdiff3/-/commit/befbaa8d7a42f4899e04decc740dfb9e48e7d0fc
--
You are receiving this mail because:
You are watching all bug changes.
