https://bugs.kde.org/show_bug.cgi?id=457766
michael <reeves...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Latest Commit|https://invent.kde.org/sdk/ |https://invent.kde.org/sdk/
|kdiff3/commit/0dd54bde01b7b |kdiff3/commit/975618cf99dc1
|9c966109a45eee9bfa5ce9d89b0 |187caba7db6ba41f85cb409f6c6
--- Comment #3 from michael <reeves...@gmail.com> ---
Git commit 975618cf99dc1187caba7db6ba41f85cb409f6c6 by Michael Reeves.
Committed on 21/09/2022 at 18:14.
Pushed by mreeves into branch 'master'.
Ingnore manually editted blocks when resolving unresolved conflicts
FIXED-IN:1.10.0
M +1 -1 src/MergeEditLine.cpp
M +4 -0 src/MergeEditLine.h
https://invent.kde.org/sdk/kdiff3/commit/975618cf99dc1187caba7db6ba41f85cb409f6c6
--
You are receiving this mail because:
You are watching all bug changes.
