https://bugs.kde.org/show_bug.cgi?id=493597

michael <reeves...@gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
      Latest Commit|https://invent.kde.org/sdk/ |https://invent.kde.org/sdk/
                   |kdiff3/-/commit/befbaa8d7a4 |kdiff3/-/commit/bf576269fe4
                   |2f4899e04decc740dfb9e48e7d0 |2d7c4832aef60e6ba9b4cc75856
                   |fc                          |d9

--- Comment #2 from michael <reeves...@gmail.com> ---
Git commit bf576269fe42d7c4832aef60e6ba9b4cc75856d9 by Michael Reeves.
Committed on 16/10/2024 at 03:01.
Pushed by mreeves into branch 'master'.

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/bf576269fe42d7c4832aef60e6ba9b4cc75856d9

-- 
You are receiving this mail because:
You are watching all bug changes.

Reply via email to